Merge branch 'dev_draw_change' into pre

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/constant/StoneConstant.java

@@ -2,17 +2,22 @@ package com.liquidnet.service.stone.constant;
 
 public class StoneConstant {
     //ctx
-    private static final String CTX="stone:";
+    private static final String CTX = "stone:";
     //user
-    public static final String USER=CTX.concat("user:");
+    public static final String USER = CTX.concat("user:");
     //item
-    public static final String ITEM=CTX.concat("item:");
+    public static final String ITEM = CTX.concat("item:");
     //logsList 积分日志列表
-    public static final String LOGS_LIST=ITEM.concat("logs:list:");
+    public static final String LOGS_LIST = ITEM.concat("logs:list:");
     //orderList 积分订单列表
-    public static final String ORDER_LIST=ITEM.concat("order:list:");
+    public static final String ORDER_LIST = ITEM.concat("order:list:");
     //orderList 积分订单列表
-    public static final String ORDER_DETAILS=ITEM.concat("order:details:");
+    public static final String ORDER_DETAILS = ITEM.concat("order:details:");
+
+    //商品列表
+    public static final String ITEM_LIST = ITEM.concat("list");
+    //商品列表分类
+    public static final String ITEM_LIST_SIMPLE = ITEM.concat("list:simpleType:");
 
     //剩余库存
     public static final String SURPLUS_GENERAL = ":surplusGeneral";

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-api/liquidnet-service-stone-api/src/main/java/com/liquidnet/service/stone/service/IStoneScoreItemsService.java

@@ -21,6 +21,8 @@ public interface IStoneScoreItemsService {
 
     PageInfo<List<StoneItemListVo>> itemList(Integer page, Integer size);
 
+    PageInfo<List<StoneItemListVo>> itemListSimpleType(Integer simpleType ,Integer page, Integer size);
+
     ResponseDto<StoneScoreItemVo> itemDetails(String itemId);
 
 }

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-web/src/main/resources/templates/zhengzai/stone/integralStore.html

@@ -58,6 +58,19 @@
         var prefix = ctx + "stone/item";
         var prefix2 = ctx;
         var couType = [[${couType}]];
+        var simpleTypeDataList = [{
+            id: 1,
+            simpleName: '5元'
+        }, {
+            id: 2,
+            simpleName: '10元'
+        }, {
+            id: 3,
+            simpleName: '25元'
+        }, {
+            id: 4,
+            simpleName: '35元'
+        }]
         $(function () {
             var options = {
                 url: prefix2 + "stone/item/list",
@@ -94,6 +107,21 @@
                             }
                         }
                     },
+                    {
+                        field: 'simpleType',
+                        title: '优惠券分类',
+                        formatter: function(value, row, index) {
+                            if (value == 0) {
+                                return '无条件';
+                            } else {
+                                for (var i in simpleTypeDataList) {
+                                    if (simpleTypeDataList[i].id == value) {
+                                        return simpleTypeDataList[i].simpleName;
+                                    }
+                                }
+                            }
+                        }
+                    },
                     {
                         field: 'busiType',
                         title: '类型',

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/integralStoreEdit.html

@@ -155,6 +155,16 @@
             <input type="radio" value="3" name="typeOne"><span>优先购</span>
         </div>
     </div>
+    <div class="labelSelect main_type">
+        <span class="labelName">优惠券分类：</span>
+        <select name="labelSelect" id="labelSelectType">
+            <option value="0">请选择优惠券分类</option>
+            <option value="1">5元</option>
+            <option value="2">10元</option>
+            <option value="3">25元</option>
+            <option value="4">35元</option>
+        </select>
+    </div>
     <div id="scoreType" class="main_type">
         <span class="labelName"><i class="required">*</i>类别：</span>
         <div class="layui-input-block" style="display: flex">
@@ -172,7 +182,6 @@
     </div>
     <div class="main_type">
         <span class="labelName"><i class="required">*</i>展示图：</span>
-        
         <div class="layui-input-block" style="display: flex;flex-direction: column;">
             <img id="viewImg" src="" alt="" style="max-height:242px;">
             <div class="ibox-content">
@@ -280,7 +289,8 @@
     let itemId = ''; // 
     let selectType = '1'
     let type = '';
-    console.log('检测')
+    let simpleType = '';
+
     $(document).ready(function() {
         var $summernote = $('#summernote').summernote({
             height: 300,
@@ -367,6 +377,12 @@
                         $("#startTime").val(data.startTime);
                         $("input[name='sex'][value='2']").attr("checked", "checked").siblings().removeAttr('checked');
                     }
+                    if (data.simpleType == 0) {
+                        $("#labelSelectType").find("option[value='0']").attr("selected",true);
+                    } else {
+                        var simpleTypeData = data.simpleType.toString();
+                        $("#labelSelectType").find("option[value=" + simpleTypeData + "]").attr("selected",true);
+                    }
                 }
             })
         }
@@ -527,6 +543,7 @@
                 endTime = $("#endTime").val();
             }
         }
+
         let data = {
             details: $('#summernote').summernote('code'), // 商品详情
             endTime: $.common.dateFormat(endTime, 'yyyy-MM-dd HH:mm:ss'), // 下架时间（status = 2 必传）
@@ -539,7 +556,8 @@
             startTime: $.common.dateFormat(startTime, 'yyyy-MM-dd HH:mm:ss'), // 上架时间status = 2 必传）
             status: Number(shelves), // 上架状态[1-不限|2-定时|7-下线]
             targetId: showId, // 目标物品id
-            targetTitle: $('#searchIpt').val() || $("#searchIptMall").val() // 目标物品标题
+            targetTitle: $('#searchIpt').val() || $("#searchIptMall").val(), // 目标物品标题
+            simpleType: $('#labelSelectType option:selected').val()
         }
         let type = 'post';
         if (!itemId) {
@@ -557,7 +575,8 @@
         } else {
             data['type'] = 11
         }
-        promiseMethods(ctx+'stone/item',type,data).then(res=>{
+        promiseMethods(ctx+'stone/item', type, data).then(res => {
+            console.log(res);
             layer.msg('' + res);
             if (res.code != undefined && res.code != web_status.SUCCESS) {
                 $.modal.alertWarning(res.msg);

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) {
@@ -155,6 +158,7 @@ public class ItemServiceImpl implements IItemService {
         if (count <= 0) {
             return "创建失败";
         }
+        redisUtils.delList(param.getSimpleType().toString());
         return "创建成功";
     }
 
@@ -188,6 +192,7 @@ public class ItemServiceImpl implements IItemService {
         if (count <= 0) {
             return "修改失败";
         }
+        redisUtils.delList(param.getSimpleType().toString());
         return "修改成功";
     }
 
@@ -202,6 +207,7 @@ public class ItemServiceImpl implements IItemService {
         data.setTargetId(param.getTargetId());
         data.setTargetTitle(param.getTargetTitle());
         data.setType(param.getType());
+        data.setSimpleType(param.getSimpleType());
         data.setImg(param.getImg());
         data.setScore(param.getScore());
         data.setPrice(BigDecimal.ZERO);

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

@@ -102,4 +102,16 @@ public class StoneRedisUtils {
         }
     }
 
+    /**
+     * 删除 积分商品列表缓存
+     *
+     * @param simpleType
+     */
+    public void delList(String simpleType) {
+        String redisKey = StoneConstant.ITEM_LIST;
+        String redisSimpleKey = StoneConstant.ITEM_LIST_SIMPLE.concat(simpleType);
+        redisDataSourceUtil.getRedisStoneUtil().del(redisKey);
+        redisDataSourceUtil.getRedisStoneUtil().del(redisSimpleKey);
+    }
+
 }

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -44,11 +44,11 @@ liquidnet:
       port: 6379
       password: 3Xa%8p
     sweet:
-      dbs: 0,16
-      database: 15
-      host: 39.107.71.112
-      port: 6379
-      password: 3Xa%8p
+      dbs: 0,256
+      database: 255
+      host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
+      port: 6380
+      password: PO@B!Iud32
     adam:
       dbs: 0,16
       database: 15

liquidnet-bus-config/liquidnet-config/liquidnet-service-stone-dev.yml

@@ -16,7 +16,7 @@ liquidnet:
     pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
     level: debug
   mysql:
-    database-name: dev_ln_scene
+    database-name: test_ln_scene
   mongodb:
     sslEnabled: false
-    database: dev_ln_scene
+    database: test_ln_scene

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;
+
     /**
      * 定时上架-时间
      */

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

@@ -31,6 +31,13 @@ public class StoneItemController {
         return ResponseDto.success(stoneScoreItemsService.itemList(page, 40));
     }
 
+    @GetMapping("list/simpleType")
+    @ApiOperation("积分商品列表(simpleType)")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<PageInfo<List<StoneItemListVo>>> itemListSimpleType(@RequestParam("page") @Valid Integer page, @RequestParam("simpleType") @Valid Integer simpleType) {
+        return ResponseDto.success(stoneScoreItemsService.itemListSimpleType(simpleType, page, 1000));
+    }
+
     @GetMapping("details")
     @ApiOperation("积分商品详情")
     @ApiResponse(code = 200, message = "接口返回对象参数")

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

@@ -46,15 +46,57 @@ public class StoneScoreItemsServiceImpl implements IStoneScoreItemsService {
             page = 1;
         }
         List<StoneScoreItems> voList;
-        HashMap<String, Object> info = mongoUtils.itemListPage(page, size);
+        long count;
+        if (page == 1) {
+            voList = redisUtils.getList();
+            count = voList.size();
+        } else {
+            HashMap<String, Object> info = mongoUtils.itemListPage(page, size, null);
             try {
                 voList = (List<StoneScoreItems>) info.get("data");
             } catch (Exception e) {
                 voList = new ArrayList();
                 e.printStackTrace();
             }
-        long count = (long) info.get("total");
+            count = 40 + (long) info.get("total");
+        }
+
+        List<StoneItemListVo> returnVoList = ObjectUtils.getStoneItemListVoArrayList();
+        for (int i = 0; i < voList.size(); i++) {
+            StoneScoreItems vo = voList.get(i);
+            StoneItemListVo returnVo = StoneItemListVo.getNew().copy(vo);
+            returnVoList.add(returnVo);
+        }
+
+        mPageInfo = new PageInfo(returnVoList);
+        mPageInfo.setTotal(count);
+
+        log.info(UserPathDto.setData("积分商品列表", "", voList));
+        return mPageInfo;
+    }
 
+    @Override
+    public PageInfo<List<StoneItemListVo>> itemListSimpleType(Integer simpleType, Integer page, Integer size) {
+        PageInfo<List<StoneItemListVo>> mPageInfo;
+        size = 40;
+        if (page == null || page == 1 || page == 0) {
+            page = 1;
+        }
+        List<StoneScoreItems> voList;
+        long count;
+        if (page == 1) {
+            voList = redisUtils.getListSimple(simpleType);
+            count = voList.size();
+        } else {
+            HashMap<String, Object> info = mongoUtils.itemListPage(page, size, simpleType);
+            try {
+                voList = (List<StoneScoreItems>) info.get("data");
+            } catch (Exception e) {
+                voList = new ArrayList();
+                e.printStackTrace();
+            }
+            count = 40 + (long) info.get("total");
+        }
 
         List<StoneItemListVo> returnVoList = ObjectUtils.getStoneItemListVoArrayList();
         for (int i = 0; i < voList.size(); i++) {
@@ -99,7 +141,7 @@ public class StoneScoreItemsServiceImpl implements IStoneScoreItemsService {
         } else {
             limitStatus = 1;
         }
-        StoneScoreItemVo vo = StoneScoreItemVo.getNew().copy(data,scoreStatus,limitStatus);
+        StoneScoreItemVo vo = StoneScoreItemVo.getNew().copy(data, scoreStatus, limitStatus);
         return ResponseDto.success(vo);
     }
 }

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

@@ -46,13 +46,17 @@ public class StoneMongoUtils {
      *
      * @return
      */
-    public HashMap<String, Object> itemListPage(int page, int size) {
+    public HashMap<String, Object> itemListPage(int page, int size, Integer simpleType) {
         LocalDateTime now = LocalDateTime.now();
         HashMap<String, Object> info = CollectionUtil.mapStringObject();
         // 排序 分页
         Pageable pageable = PageRequest.of(page - 1, size, Sort.by(Sort.Direction.DESC, "createdAt"));
         //条件
-        Query query = Query.query(new Criteria().orOperator(Criteria.where("status").is(1),Criteria.where("status").is(2).and("startTime").lte(now).and("endTime").gte(now)));
+        Criteria criteria = new Criteria().orOperator(Criteria.where("status").is(1), Criteria.where("status").is(2).and("startTime").lte(now).and("endTime").gte(now));
+        if (simpleType != null) {
+            criteria = criteria.and("simpleType").is(simpleType);
+        }
+        Query query = Query.query(criteria);
         // 查询总数
         long count = mongoTemplate.count(query, StoneScoreItems.class, StoneScoreItems.class.getSimpleName());
         query.with(pageable);
@@ -80,7 +84,7 @@ public class StoneMongoUtils {
      */
     public StoneUserVo userGet(String uid) {
         Query query = Query.query(Criteria.where("uid").is(uid));
-        StoneUserVo vo = mongoTemplate.findOne(query, StoneUserVo.class,StoneUserVo.class.getSimpleName());
+        StoneUserVo vo = mongoTemplate.findOne(query, StoneUserVo.class, StoneUserVo.class.getSimpleName());
         return vo;
     }
 
@@ -109,12 +113,13 @@ public class StoneMongoUtils {
 
     /**
      * 获取 用户积分日志 列表
+     *
      * @param uid
      * @param page
      * @param size
      * @return
      */
-    public HashMap<String, Object> logList(String uid,int page, int size) {
+    public HashMap<String, Object> logList(String uid, int page, int size) {
         LocalDateTime now = LocalDateTime.now();
         HashMap<String, Object> info = CollectionUtil.mapStringObject();
         // 排序 分页
@@ -143,12 +148,13 @@ public class StoneMongoUtils {
 
     /**
      * 获取 用户订单 列表
+     *
      * @param uid
      * @param page
      * @param size
      * @return
      */
-    public HashMap<String, Object> orderList(String uid,int page, int size) {
+    public HashMap<String, Object> orderList(String uid, int page, int size) {
         LocalDateTime now = LocalDateTime.now();
         HashMap<String, Object> info = CollectionUtil.mapStringObject();
         // 排序 分页

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

@@ -9,6 +9,7 @@ import com.liquidnet.service.stone.vo.StoneUserVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Component
@@ -19,6 +20,39 @@ public class StoneRedisUtils {
     @Autowired
     private StoneMongoUtils mongoUtils;
 
+
+    public List<StoneScoreItems> getList() {
+        try {
+            String redisKey = StoneConstant.ITEM_LIST;
+            Object obj = redisUtil.get(redisKey);
+            if (obj == null) {
+                List<StoneScoreItems> list = (List<StoneScoreItems>) mongoUtils.itemListPage(1, 40, null).get("data");
+                redisUtil.set(redisKey, list);
+                return list;
+            } else {
+                return (List<StoneScoreItems>) obj;
+            }
+        }catch (Exception e){
+            return new ArrayList();
+        }
+    }
+
+    public List<StoneScoreItems> getListSimple(Integer simpleType) {
+        try {
+            String redisKey = StoneConstant.ITEM_LIST_SIMPLE.concat(simpleType.toString());
+            Object obj = redisUtil.get(redisKey);
+            if (obj == null) {
+                List<StoneScoreItems> list = (List<StoneScoreItems>) mongoUtils.itemListPage(1, 40, simpleType).get("data");
+                redisUtil.set(redisKey, list);
+                return list;
+            } else {
+                return (List<StoneScoreItems>) obj;
+            }
+        }catch (Exception e){
+            return new ArrayList();
+        }
+    }
+
     /**
      * 获取 积分物品 剩余库存
      *
@@ -202,7 +236,7 @@ public class StoneRedisUtils {
         Object obj = redisUtil.get(redisKey);
         if (obj == null) {
             List<StoneScoreLogs> getLogsList = (List<StoneScoreLogs>) mongoUtils.logList(uid, 1, 40).get("data");
-            redisUtil.set(redisKey,getLogsList);
+            redisUtil.set(redisKey, getLogsList);
             return getLogsList;
         } else {
             return (List<StoneScoreLogs>) obj;
@@ -314,12 +348,12 @@ public class StoneRedisUtils {
     }
 
 
-    public boolean lockUid(String uid){
+    public boolean lockUid(String uid) {
         String redisKey = StoneConstant.LOCK.concat(uid);
-        return redisUtil.lock(uid,1,1);
+        return redisUtil.lock(uid, 1, 1);
     }
 
-    public void unLockUid(String uid){
+    public void unLockUid(String uid) {
         String redisKey = StoneConstant.LOCK.concat(uid);
         redisUtil.uLock(redisKey);
     }