积分商品 分类列表 1000分页 增加库存-999无限库存

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/stone/StoneItemController.java

@@ -19,6 +19,8 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 @Api(tags = "积分物品")
@@ -53,6 +55,20 @@ public class StoneItemController extends BaseController {
     public TableDataInfo list(StoneListParam listParam) {
         startPage();
         List<StoneScoreItems> result = iItemService.itemList(listParam.getTitle(), listParam.getState(), listParam.getType(), listParam.getSimpleType());
+        List<StoneScoreItems> newList = new ArrayList();
+        LocalDateTime now = LocalDateTime.now();
+        for (StoneScoreItems item : result) {
+            if (item.getStatus() == 2) {
+                if (now.isAfter(item.getStartTime())) {//未上架
+                    item.setStatus(2);
+                } else if (now.isBefore(item.getEndTime())) {//已下架
+                    item.setStatus(7);
+                } else {
+                    item.setStatus(1);//上架中
+                }
+            }
+            newList.add(item);
+        }
         return getDataTable(result);
     }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/stone/service/impl/ItemServiceImpl.java

@@ -44,7 +44,6 @@ public class ItemServiceImpl implements IItemService {
      */
     public List<StoneScoreItems> itemList(String title, Integer status, Integer type, Integer simpleType) {
         LocalDateTime now = LocalDateTime.now();
-        List<StoneScoreItems> newList = new ArrayList();
         LambdaQueryWrapper<StoneScoreItems> queryWrapper = Wrappers.lambdaQuery(StoneScoreItems.class).ne(StoneScoreItems::getStatus, -1);
         if (!(title == null || title.equals(""))) {
             queryWrapper.like(StoneScoreItems::getTargetTitle, title);
@@ -69,19 +68,7 @@ public class ItemServiceImpl implements IItemService {
             }
         }
         List<StoneScoreItems> voList = stoneScoreItemsMapper.selectList(queryWrapper);
-        for (StoneScoreItems item : voList) {
-            if (item.getStatus() == 2) {
-                if (now.isAfter(item.getStartTime())) {//未上架
-                    item.setStatus(2);
-                } else if (now.isBefore(item.getEndTime())) {//已下架
-                    item.setStatus(7);
-                } else {
-                    item.setStatus(1);//上架中
-                }
-            }
-            newList.add(item);
-        }
-        return newList;
+        return voList;
     }
 
     @Override

liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web-dev.yml

@@ -15,14 +15,14 @@ liquidnet:
             urlHostAndPort: ${liquidnet.mysql.urlHostAndPort}
             username: ${liquidnet.mysql.username}
             password: ${liquidnet.mysql.password}
-            database-name: dev_ln_scene
+            database-name: test_ln_scene
         slave:
             urlHostAndPort: ${liquidnet.mysql.urlHostAndPort}
             username: ${liquidnet.mysql.username}
             password: ${liquidnet.mysql.password}
-            database-name: dev_ln_scene
+            database-name: test_ln_scene
     mongodb:
         sslEnabled: false
-        database: dev_ln_scene
+        database: test_ln_scene
 
 # end-dev-这里是配置信息基本值
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-stone/liquidnet-service-stone-impl/src/main/java/com/liquidnet/service/stone/service/impl/StoneScoreOrderServiceImpl.java

@@ -56,7 +56,9 @@ public class StoneScoreOrderServiceImpl implements IStoneScoreOrderService {
         if (data == null) {
             return ResponseDto.failure("参数异常");
         }
-        if (stoneRedisUtils.getStoneGeneralSurplus(itemId) <= 0) {
+
+        boolean is8 = stoneRedisUtils.getStoneGeneralSurplus(itemId) == -999;
+        if (stoneRedisUtils.getStoneGeneralSurplus(itemId) <= 0 && !is8) {
             return ResponseDto.failure("该商品库存不足");
         }
 //        StoneScoreItemVo vo = StoneScoreItemVo.getNew().copy(data, 1, 1);
@@ -80,7 +82,9 @@ public class StoneScoreOrderServiceImpl implements IStoneScoreOrderService {
         //增加限购
         stoneRedisUtils.addItemLimit(uid, itemId, number);
         //减少库存
-        stoneRedisUtils.changeStoneGeneralSurplus(itemId, -number);
+        if (!is8) {
+            stoneRedisUtils.changeStoneGeneralSurplus(itemId, -number);
+        }
         //减少积分
         stoneScoreLogsService.deScore(uid, needScore, 0, "购买积分商品:" + data.getTargetTitle());
         //下单