exit

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

@@ -18,7 +18,7 @@ public class GoblinGoodsAnticipateUpdateParam {
 
     @ApiModelProperty(value ="预约id")
     @NotBlank(message = "预约id")
-    private String autId;
+    private String antId;
 
     /**
      * 预约名称

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

@@ -54,6 +54,12 @@ public class GoblinGoodsAnticipateVo implements Serializable {
     @ApiModelProperty(value = "预约人数")
     private Long aboutPeople;
 
+    /**
+     * 预约人数
+     */
+    @ApiModelProperty(value = "实际预约人数")
+    private Long actualPeople;
+
     /**
      * 预约开始时间
      */

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

@@ -137,7 +137,7 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
         sqlValue.add(new Object[]{
                 goodsAnticipateUpdateParam.getName(),
                 goodsAnticipateUpdateParam.getRule(),
-                goodsAnticipateUpdateParam.getAutId()
+                goodsAnticipateUpdateParam.getAntId()
         });
         sendRedis("goblin_goods_anticipate_update", sqlValue);
         return ResponseDto.success();
@@ -158,8 +158,7 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
         if (goblinMongoUtils.delGoodsAnticipateVo(antId)) {
             return ResponseDto.success();
         }
-        log.error("delete() antId:{}", antId);
-        return ResponseDto.failure("请重试");
+        return ResponseDto.success();
     }
 
     @Override

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

@@ -103,7 +103,7 @@ public class GoblinMongoUtils {
      * 根据antId修改  预约人数
      */
     public void updateGoblinGoodsAnticipateVo(GoblinGoodsAnticipateUpdateParam goodsAnticipateUpdateParam) {
-        Query query = Query.query(Criteria.where("antId").is(goodsAnticipateUpdateParam.getAutId()));
+        Query query = Query.query(Criteria.where("antId").is(goodsAnticipateUpdateParam.getAntId()));
         Update update = new Update().set("name", goodsAnticipateUpdateParam.getName()).set("rule", goodsAnticipateUpdateParam.getRule()).set("updateDate",LocalDateTime.now());
         mongoTemplate.updateFirst(query, update, GoblinGoodsAnticipateVo.class.getSimpleName());
     }
@@ -113,12 +113,7 @@ public class GoblinMongoUtils {
      */
     public boolean delGoodsAnticipateVo(String antId) {
         //查询该预约下有多少个开启预约的skuId
-        List<GoblinGoodsAnticipateValueVo> goodsAnticipateValues = getGoodsAnticipateValues(antId);
-        if (goodsAnticipateValues!=null && goodsAnticipateValues.size()>0){
-            goodsAnticipateValues.forEach(goblinGoodsAnticipateValueVo -> {
-                redisUtils.delGoodsAnticipateVo(goblinGoodsAnticipateValueVo.getSkuId());
-            });
-        }
+        delAnticipateValues(antId);
         redisUtils.delGoodsAnticipateVo(antId);
         Query query = Query.query(Criteria.where("antId").is(antId));
         return mongoTemplate.remove(query, GoblinGoodsAnticipateVo.class.getSimpleName()).getDeletedCount() > 0;
@@ -127,8 +122,8 @@ public class GoblinMongoUtils {
     /**
      * 根据活动id查询关联
      */
-    public List<GoblinGoodsAnticipateValueVo> getGoodsAnticipateValues(String autId){
-        Criteria criteria = Criteria.where("autId").is(autId);
+    public List<GoblinGoodsAnticipateValueVo> getGoodsAnticipateValues(String antId){
+        Criteria criteria = Criteria.where("antId").is(antId);
         Query query = Query.query(criteria);
         return mongoTemplate.find(query, GoblinGoodsAnticipateValueVo.class, GoblinGoodsAnticipateValueVo.class.getSimpleName());
     }
@@ -144,16 +139,22 @@ public class GoblinMongoUtils {
     /**
      * 根据预约ID获取预约详情
      */
-    public GoblinGoodsAnticipateVo getAnticipateVo(String autId) {
-        return mongoTemplate.findOne(Query.query(Criteria.where("autId").is(autId)),
+    public GoblinGoodsAnticipateVo getAnticipateVo(String antId) {
+        return mongoTemplate.findOne(Query.query(Criteria.where("autId").is(antId)),
                 GoblinGoodsAnticipateVo.class, GoblinGoodsAnticipateVo.class.getSimpleName());
     }
 
+    /**
+     * 添加预约中间表信息
+     */
     public void addAnticipateValues(GoblinGoodsAnticipateValueVo goodsAnticipateValueVo) {
         mongoTemplate.insert(goodsAnticipateValueVo, GoblinGoodsAnticipateValueVo.class.getSimpleName());
     }
 
-
+    public void delAnticipateValues(String antId){
+        Query query = Query.query(Criteria.where("antId").is(antId));
+        mongoTemplate.remove(query, GoblinGoodsAnticipateValueVo.class.getSimpleName()).getDeletedCount();
+    }
 
     /* ---------------------------------------- 平台分类数据源 ---------------------------------------- */
 

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

@@ -137,7 +137,7 @@ goblin_user_digital_artwork.update_for_unboxing=UPDATE goblin_user_digital_artwo
 goblin_goods_anticipate=INSERT INTO goblin_goods_anticipate(ant_id,`name`,`rule`,actual_people,about_start_date,about_end_date,created_date,del_tag) VALUES(?,?,?,?,?,?,?,?) 
 goblin_goods_anticipate_update_actual_add_people=UPDATE goblin_goods_anticipate SET actual_people = actual_people+1 WHERE ant_id = ?
 goblin_goods_anticipate_update_actual_reduce_people=UPDATE goblin_goods_anticipate SET actual_people = actual_people-1 WHERE ant_id = ?
-goblin_goods_anticipate_delete=UPDATE goblin_goods_anticipate SET `del_tag` = 1,update_date = NOW() WHERE ant_id = ? 
+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 WHERE ant_id = ?