exit

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

@@ -73,4 +73,10 @@ public class GoblinGoodsAnticipateValueParam {
     @NotBlank(message = "预约结束时间不能为空")
     private LocalDateTime aboutEndDate;
 
+    /**
+     * 删除（0:未删除1:已删除）
+     */
+    @ApiModelProperty(value = "修改传入参数 创建不传 删除（0:未删除1:已删除）")
+    private Integer delTag;
+
 }

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

@@ -73,7 +73,7 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
             }
             Integer autIdPeople = goblinRedisUtils.getAutIdPeople(goblinGoodsAnticipateVo.getAntId());
             //预约人数
-            goblinGoodsAnticipateVo.setAboutPeople(goblinGoodsAnticipateVo.getAboutPeople()+(autIdPeople!=null?autIdPeople:0));
+            goblinGoodsAnticipateVo.setAboutPeople(goblinGoodsAnticipateVo.getAboutPeople() + (autIdPeople != null ? autIdPeople : 0));
             //获取真实预约人数
             goblinGoodsAnticipateVo.setActualPeople(autIdPeople);
         }
@@ -158,7 +158,7 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
         //预约库删除
         sendRedis("goblin_goods_anticipate_delete", sqlValue);
         //预约关联库删除
-        sendRedis("goblin_goods_anticipate_value_delete", sqlValue);
+        sendRedis("goblin_goods_anticipate_value_delete_by_antId", sqlValue);
         //删除mongodb
         if (goblinMongoUtils.delGoodsAnticipateVo(antId)) {
             return ResponseDto.success();
@@ -189,7 +189,7 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
             //mongodb记录
             goblinRedisUtils.setUserAboutSku(user);
             //新增
-            sendRedis("goblin_goods_anticipate_update_actual_add_people",antIdValue);
+            sendRedis("goblin_goods_anticipate_update_actual_add_people", antIdValue);
         } else {
             //mysql删除用户记录
             sqlValue.add(new Object[]{
@@ -199,7 +199,7 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
             sendRedis("goblin_goods_anticipate_user_update", sqlValue);
             //删除缓存  redis和mongodb
             goblinRedisUtils.delUserAboutSku(skuId, uid);
-            sendRedis("goblin_goods_anticipate_update_actual_reduce_people",antIdValue);
+            sendRedis("goblin_goods_anticipate_update_actual_reduce_people", antIdValue);
         }
         goblinRedisUtils.setAutIdPeople(antId, state);
 
@@ -209,8 +209,9 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
     @Override
     public ResponseDto<Object> addAnticipateValues(List<GoblinGoodsAnticipateValueParam> list) {
         if (list != null && list.size() > 0) {
-            for (GoblinGoodsAnticipateValueParam vo : list){
-                if (goblinRedisUtils.getAnticipate(vo.getAntId(),vo.getSkuId())) return ResponseDto.failure("该预约已选择该sku");
+            for (GoblinGoodsAnticipateValueParam vo : list) {
+                if (goblinRedisUtils.getAnticipate(vo.getAntId(), vo.getSkuId()))
+                    return ResponseDto.failure("该预约已选择该sku");
             }
             list.forEach(item -> {
                 GoblinGoodsAnticipateValueVo goodsAnticipateValueVo = new GoblinGoodsAnticipateValueVo();
@@ -220,7 +221,7 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
                 goodsAnticipateValueVo.setDelTag(0);
                 //redis消息
                 //redis标识存入该sku处于预约列表
-                goblinRedisUtils.setAnticipate(goodsAnticipateValueVo.getAntId(),goodsAnticipateValueVo.getSkuId());
+                goblinRedisUtils.setAnticipateValue(goodsAnticipateValueVo.getAntId(), goodsAnticipateValueVo.getSkuId());
 
                 //保存mysql中间表
                 LinkedList<Object[]> sqlValue = CollectionUtil.linkedListObjectArr();
@@ -250,23 +251,36 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
             list.forEach(item -> {
                 GoblinGoodsAnticipateValueVo goodsAnticipateValueVo = new GoblinGoodsAnticipateValueVo();
                 BeanUtils.copyProperties(item, goodsAnticipateValueVo);
-                //redis消息
-                //redis标识存入该sku处于预约列表
-                goblinRedisUtils.setAnticipate(goodsAnticipateValueVo.getAntId(),goodsAnticipateValueVo.getSkuId());
 
-                //保存mysql中间表
                 LinkedList<Object[]> sqlValue = CollectionUtil.linkedListObjectArr();
-                sqlValue.add(new Object[]{
-                        goodsAnticipateValueVo.getAboutStartDate(),
-                        goodsAnticipateValueVo.getAboutEndDate(),
-                        goodsAnticipateValueVo.getAntId(),
-                        goodsAnticipateValueVo.getSkuId(),
-                        goodsAnticipateValueVo.getSpuId(),
-                });
-                sendRedis("goblin_goods_anticipate_value_update", sqlValue);
+                if (goodsAnticipateValueVo.getDelTag() == 1) {
+                    //删除该sku关联
+                    goblinMongoUtils.delAnticipateValueVo(goodsAnticipateValueVo);
+                    //删除redis
+                    goblinRedisUtils.delAnticipateValue(goodsAnticipateValueVo.getAntId(), goodsAnticipateValueVo.getSkuId());
+                    //删除mysql中的关联数据
+                    sqlValue.add(new Object[]{
+                            goodsAnticipateValueVo.getAntId(),
+                            goodsAnticipateValueVo.getSkuId()
+                    });
+                    sendRedis("goblin_goods_anticipate_value_delete_by_antId_and_skuId",sqlValue);
+                } else {
+                    //保存mysql中间表
+                    sqlValue.add(new Object[]{
+                            goodsAnticipateValueVo.getAboutStartDate(),
+                            goodsAnticipateValueVo.getAboutEndDate(),
+                            goodsAnticipateValueVo.getAntId(),
+                            goodsAnticipateValueVo.getSkuId(),
+                            goodsAnticipateValueVo.getSpuId(),
+                    });
+                    sendRedis("goblin_goods_anticipate_value_update", sqlValue);
+
+                    //修改mongodb
+                    goblinMongoUtils.updateAnticipateValueVo(goodsAnticipateValueVo);
+                }
             });
         }
-        return null;
+        return ResponseDto.success();
     }
 
 

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

@@ -151,11 +151,31 @@ public class GoblinMongoUtils {
         mongoTemplate.insert(goodsAnticipateValueVo, GoblinGoodsAnticipateValueVo.class.getSimpleName());
     }
 
+    /**
+     * 根据预约id和skuId删除关联
+     */
+    public void delAnticipateValueVo(GoblinGoodsAnticipateValueVo goodsAnticipateValueVo) {
+        Query query = Query.query(Criteria.where("antId").is(goodsAnticipateValueVo.getAntId()).and("skuId").is(goodsAnticipateValueVo.getSkuId()));
+        mongoTemplate.remove(query, GoblinGoodsAnticipateValueVo.class.getSimpleName()).getDeletedCount();
+    }
+
+    /**
+     * 根据预约id删除sku关联信息
+     */
     public void delAnticipateValues(String antId){
         Query query = Query.query(Criteria.where("antId").is(antId));
         mongoTemplate.remove(query, GoblinGoodsAnticipateValueVo.class.getSimpleName()).getDeletedCount();
     }
 
+    /**
+     * 修改sku关联信息
+     */
+    public void updateAnticipateValueVo(GoblinGoodsAnticipateValueVo goodsAnticipateValueVo) {
+        Query query = Query.query(Criteria.where("antId").is(goodsAnticipateValueVo.getAntId()).and("skuId").is(goodsAnticipateValueVo.getSkuId()));
+        Update update = new Update().set("aboutStartDate", goodsAnticipateValueVo.getAboutStartDate()).set("aboutEndDate", goodsAnticipateValueVo.getAboutEndDate()).set("updateDate",LocalDateTime.now());
+        mongoTemplate.updateFirst(query, update, GoblinGoodsAnticipateValueVo.class.getSimpleName());
+    }
+
     /* ---------------------------------------- 平台分类数据源 ---------------------------------------- */
 
     public List<GoblinSelfGoodsCategoryVo> getSelfGoodsCategoryVos() {

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

@@ -47,10 +47,19 @@ public class GoblinRedisUtils {
     /**
      * 该skuId已开启预约
      */
-    public void setAnticipate(String antId, String skuId){
+    public void setAnticipateValue(String antId, String skuId){
         redisUtil.set(GoblinRedisConst.ANTICIPATE_SKUID.concat(antId).concat(skuId),1);
     }
 
+    /**
+     * 删除skuId已开启预约
+     */
+    public void delAnticipateValue(String antId, String skuId){
+        redisUtil.del(GoblinRedisConst.ANTICIPATE_SKUID.concat(antId).concat(skuId));
+    }
+
+
+
     /**
      * 获取关联
      */

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

@@ -140,7 +140,8 @@ goblin_goods_anticipate_update_actual_reduce_people=UPDATE goblin_goods_anticipa
 goblin_goods_anticipate_delete=UPDATE goblin_goods_anticipate SET `del_tag` = 1 WHERE ant_id = ? 
 goblin_goods_anticipate_value=INSERT INTO goblin_goods_anticipate_value (ant_id,sku_name,sku_id,spu_id,about_start_date,about_end_date,created_date,del_tag) VALUES(?,?,?,?,?,?,?,?) 
 goblin_goods_anticipate_value_update=UPDATE goblin_goods_anticipate_value SET `about_start_date` = ?,`about_end_date`= ?,update_date = NOW() WHERE ant_id = ? AND sku_id = ? AND spu_id = ?
-goblin_goods_anticipate_value_delete=UPDATE goblin_goods_anticipate_value SET `del_tag` = 1,update_date = NOW() WHERE ant_id = ? 
+goblin_goods_anticipate_value_delete_by_antId=UPDATE goblin_goods_anticipate_value SET `del_tag` = 1,update_date = NOW() WHERE ant_id = ? 
+goblin_goods_anticipate_value_delete_by_antId_and_skuId=UPDATE goblin_goods_anticipate_value SET `del_tag` = 1,update_date = NOW() WHERE ant_id = ? AND sku_id = ? 
 goblin_goods_anticipate_update=UPDATE goblin_goods_anticipate SET `name` = ?,`rule`= ? WHERE ant_id = ? 
 goblin_goods_anticipate_update_proper=UPDATE goblin_goods_anticipate SET about_people = ? WHERE ant_id = ? 
 goblin_goods_anticipate_user=INSERT INTO goblin_goods_anticipate_user(uid,sku_id,phone,state) VALUES(?,?,?,?)