提交 积分商品增加 字段 simpleType 区别于 TYPE字段 用作局 类别分组

docu/dev_draw_change.sql

+--  添加积分券  --
+ALTER TABLE stone_score_items ADD simple_type tinyint DEFAULT 0 COMMENT '类别(区别于TYPE字段)';

liquidnet-bus-api/liquidnet-service-stone-api/src/main/java/com/liquidnet/service/stone/param/StoneItemBuildParam.java

@@ -15,6 +15,8 @@ public class StoneItemBuildParam {
     private String itemId;
     @ApiModelProperty(required = true, value = "目标类型[1-券|11-商品维度|21-演出维度]", example = "1")
     private Integer type;
+    @ApiModelProperty(required = false, value = "前端暂定 0为默认值 无条件")
+    private Integer simpleType;
     @NotBlank(message = "目标物品不能为空")
     @ApiModelProperty(value = "目标物品id", example = "1")
     private String targetId;

liquidnet-bus-api/liquidnet-service-stone-api/src/main/java/com/liquidnet/service/stone/param/StoneListParam.java

@@ -20,4 +20,6 @@ public class StoneListParam {
      */
     @ApiModelProperty(required = false, value = "状态[1-券]", example = "1")
     private Integer type;
+    @ApiModelProperty(required = false, value = "前端定义 0位默认值 无条件", example = "0")
+    private Integer simpleType;
 }

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

@@ -39,7 +39,7 @@ public class StoneItemController extends BaseController {
 
     @GetMapping("integralStoreEdit")
     @ApiOperation(value = "积分商品:详情View")
-    public String integralStoreEdit (ModelMap mmap) {
+    public String integralStoreEdit(ModelMap mmap) {
         mmap.put("platformUrl", platformUrl);
         return prefix + "/integralStoreEdit";
     }
@@ -49,7 +49,7 @@ public class StoneItemController extends BaseController {
     @PostMapping("list")
     @ResponseBody
     public TableDataInfo list(StoneListParam listParam) {
-        PageInfo<StoneScoreItems> result = iItemService.itemList(listParam.getTitle(), listParam.getState(), listParam.getType());
+        PageInfo<StoneScoreItems> result = iItemService.itemList(listParam.getTitle(), listParam.getState(), listParam.getType(), listParam.getSimpleType());
         TableDataInfo rspData = new TableDataInfo();
         rspData.setCode(0);
         rspData.setRows(result.getList());

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

@@ -17,7 +17,7 @@ public interface IItemService {
      * @param type   类型[1-券]
      * @return
      */
-    PageInfo<StoneScoreItems> itemList(String title, Integer status, Integer type);
+    PageInfo<StoneScoreItems> itemList(String title, Integer status, Integer type, Integer simpleType);
 
     /**
      * 修改 积分物品 状态

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

@@ -42,7 +42,7 @@ public class ItemServiceImpl implements IItemService {
      * @param type   类型[1-券]
      * @return
      */
-    public PageInfo<StoneScoreItems> itemList(String title, Integer status, Integer type) {
+    public PageInfo<StoneScoreItems> itemList(String title, Integer status, Integer type, Integer simpleType) {
         PageInfo<StoneScoreItems> pageInfo;
         LocalDateTime now = LocalDateTime.now();
         List<StoneScoreItems> newList = new ArrayList();
@@ -65,6 +65,9 @@ public class ItemServiceImpl implements IItemService {
             if (type != -1) {
                 queryWrapper.eq(StoneScoreItems::getType, type);
             }
+            if (simpleType != 0) {
+                queryWrapper.eq(StoneScoreItems::getSimpleType, simpleType);
+            }
         }
         List<StoneScoreItems> voList = stoneScoreItemsMapper.selectList(queryWrapper);
         for (StoneScoreItems item : voList) {
@@ -202,6 +205,7 @@ public class ItemServiceImpl implements IItemService {
         data.setTargetId(param.getTargetId());
         data.setTargetTitle(param.getTargetTitle());
         data.setType(param.getType());
+        data.setType(param.getSimpleType());
         data.setImg(param.getImg());
         data.setScore(param.getScore());
         data.setPrice(BigDecimal.ZERO);

liquidnet-bus-do/liquidnet-service-stone-do/src/main/java/com/liquidnet/service/stone/entity/StoneScoreItems.java

@@ -90,6 +90,11 @@ public class StoneScoreItems implements Serializable {
      */
     private Integer status;
 
+    /**
+     * 类别(区别于TYPE字段)
+     */
+    private Integer simpleType;
+
     /**
      * 定时上架-时间
      */