exit 预约表新增uid字段

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/vo/GoblinGoodsAnticipateValueVo.java

@@ -22,6 +22,11 @@ public class GoblinGoodsAnticipateValueVo implements Cloneable{
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * uid
+     */
+    @ApiModelProperty(value = "uid")
+    private String uid;
 
     /**
      * antId

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinGoodsAnticipateMgServiceImpl.java

@@ -2,7 +2,9 @@ package com.liquidnet.service.goblin.service.impl.manage;
 
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.commons.lang.util.CollectionUtil;
+import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
@@ -50,6 +52,9 @@ public class GoblinGoodsAnticipateMgServiceImpl implements IGoblinGoodsAnticipat
     @Autowired
     QueueUtils queueUtils;
 
+    @Autowired
+    GoblinAnticipateUtils goblinAnticipateUtils;
+
     @Override
     public ResponseDto<Object> add(GoblinGoodsAnticipateAddParam goodsAnticipateAddParam) {
         if (StringUtils.isNotBlank(goodsAnticipateAddParam.getRule()) && goodsAnticipateAddParam.getList() != null && goodsAnticipateAddParam.getList().size() > 0) {
@@ -92,10 +97,13 @@ public class GoblinGoodsAnticipateMgServiceImpl implements IGoblinGoodsAnticipat
     }
 
     public void addAnticipateValues(String antId, String rule, List<GoblinGoodsAnticipateValueAddParam> list) {
+        //获取创建者uid
+        String uid = CurrentUtil.getCurrentUid();
         if (list != null && list.size() > 0) {
             list.forEach(item -> {
                 GoblinGoodsAnticipateValueVo goodsAnticipateValueVo = new GoblinGoodsAnticipateValueVo();
                 goodsAnticipateValueVo.copy(item);
+                goodsAnticipateValueVo.setUid(uid);
                 goodsAnticipateValueVo.setAntId(antId);
                 goodsAnticipateValueVo.setRule(rule);
                 goodsAnticipateValueVo.setCreatedDate(LocalDateTime.now());
@@ -109,6 +117,7 @@ public class GoblinGoodsAnticipateMgServiceImpl implements IGoblinGoodsAnticipat
                 //保存mysql中间表
                 LinkedList<Object[]> sqlValue = CollectionUtil.linkedListObjectArr();
                 sqlValue.add(new Object[]{
+                        goodsAnticipateValueVo.getUid(),
                         goodsAnticipateValueVo.getAntId(),
                         goodsAnticipateValueVo.getSkuName(),
                         goodsAnticipateValueVo.getSkuId(),
@@ -132,8 +141,8 @@ public class GoblinGoodsAnticipateMgServiceImpl implements IGoblinGoodsAnticipat
     @Override
     public ResponseDto<PageInfo<GoblinGoodsAnticipateValueVo>> list(GoblinGoodsAnticipateValueParam goodsAnticipateValueParam) {
         PageInfo<GoblinGoodsAnticipateValueVo> pageInfo = new PageInfo<>();
-
-        HashMap<String, Object> map = goblinMongoUtils.getGoblinGoodsAnticipateValueVos(goodsAnticipateValueParam);
+        String uid = CurrentUtil.getCurrentUid();
+        HashMap<String, Object> map = goblinMongoUtils.getGoblinGoodsAnticipateValueVos(goodsAnticipateValueParam,uid);
         List<GoblinGoodsAnticipateValueVo> data = (List<GoblinGoodsAnticipateValueVo>) map.get("data");
         for (GoblinGoodsAnticipateValueVo anticipateValueVo : data) {
             //查询真实预约人数
@@ -172,7 +181,10 @@ public class GoblinGoodsAnticipateMgServiceImpl implements IGoblinGoodsAnticipat
     public ResponseDto<Object> delete(String skuId) {
         //更具skuId查询
         GoblinGoodsAnticipateValueVo goodsAnticipateValueVo = goblinRedisUtils.getValueBySkuId(skuId);
-
+        String uid = CurrentUtil.getCurrentUid();
+        if (!goodsAnticipateValueVo.getUid().equals(uid)){
+            return ResponseDto.failure("无权限删除");
+        }
         if (goodsAnticipateValueVo != null) {
             goodsAnticipateValueVo.setState(GoblinAnticipateUtils.setState(goodsAnticipateValueVo.getAboutStartDate(), goodsAnticipateValueVo.getAboutEndDate()));
             //没有开启则可以删除预约

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java

@@ -2,7 +2,9 @@ package com.liquidnet.service.goblin.util;
 
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.base.PagedResult;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.constant.GoblinRedisConst;
 import com.liquidnet.service.goblin.constant.GoblinStatusConst;
 import com.liquidnet.service.goblin.dto.manage.*;
@@ -57,10 +59,10 @@ public class GoblinMongoUtils {
     /**
      * 分页查询
      */
-    public HashMap<String, Object> getGoblinGoodsAnticipateValueVos(GoblinGoodsAnticipateValueParam goblinGoodsAnticipateValueParam) {
+    public HashMap<String, Object> getGoblinGoodsAnticipateValueVos(GoblinGoodsAnticipateValueParam goblinGoodsAnticipateValueParam,String uid) {
         HashMap<String, Object> info = CollectionUtil.mapStringObject();
         Pageable pageable = PageRequest.of(goblinGoodsAnticipateValueParam.getPageNum() - 1, 20, Sort.by(Sort.Direction.DESC, "createdDate"));
-        Criteria criteria = Criteria.where("delTag").is(0);
+        Criteria criteria = Criteria.where("delTag").is(0).and("uid").is(uid);
         if (StringUtils.isNotBlank(goblinGoodsAnticipateValueParam.getName())) {
             criteria = criteria.and("skuName").regex(".*?" + goblinGoodsAnticipateValueParam.getName() + ".*");
         }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/sqlmap.properties

@@ -136,7 +136,7 @@ goblin_user_digital_artwork.update_for_unboxing=UPDATE goblin_user_digital_artwo
 #----
 #----       \u9884\u7EA6
 goblin_goods_anticipate=INSERT INTO goblin_goods_anticipate(ant_id,`rule`,created_date,del_tag) VALUES(?,?,?,?) 
-goblin_goods_anticipate_value=INSERT INTO goblin_goods_anticipate_value (ant_id,sku_name,sku_id,spu_id,about_people,actual_people,rule,about_start_date,about_end_date,created_date,del_tag) VALUES(?,?,?,?,?,?,?,?,?,?,?) 
+goblin_goods_anticipate_value=INSERT INTO goblin_goods_anticipate_value (uid,ant_id,sku_name,sku_id,spu_id,about_people,actual_people,rule,about_start_date,about_end_date,created_date,del_tag) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) 
 goblin_goods_anticipate_value_update_proper=UPDATE goblin_goods_anticipate_value SET about_people = ?,update_date = NOW() WHERE sku_id = ? 
 goblin_goods_anticipate_value_delete=UPDATE goblin_goods_anticipate_value SET `del_tag` = 1,update_date = NOW()  WHERE sku_id = ? 
 goblin_goods_anticipate_user=INSERT INTO goblin_goods_anticipate_user(uid,sku_id,phone,state) VALUES(?,?,?,?)