bug:新增修改组合购

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

@@ -116,6 +116,7 @@ public class GoblinMixDetailsVo implements Serializable, Cloneable {
         this.setXlsName(source.getXlsName());
         this.setStoreId(source.getStoreId());
         this.setShelvesTime(source.getShelvesTime());
+        this.setReserve(source.getReserve());
         return this;
     }
 

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

@@ -63,5 +63,10 @@ public interface IGoblinGoodsAnticipateMgService {
      */
     ResponseDto<Boolean> reserveByMix(String mixId);
 
+    /**
+     * 根据mixId查询用户是否预约该混合购
+     * @param mixId 组合购id
+     * @return Boolean
+     */
     ResponseDto<Boolean> reserveMixByUid(String mixId);
 }

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

@@ -94,7 +94,7 @@ public class GoblinMixAppController {
     }
 
     @ApiOperationSupport(order = 7)
-    @ApiOperation(value = "用户是否预约Mix")
+    @ApiOperation(value = "根据mixId查询用户是否预约该混合购")
     @GetMapping("reserveMixByUid")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "mixId", value = "混合售id"),

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

@@ -236,6 +236,7 @@ public class GoblinMixServiceImpl implements IGoblinMixService {
         vo.setWhiteUrl(param.getWhiteUrl());
         vo.setXlsName(param.getXlsName());
         vo.setShelvesTime(param.getShelvesTime());
+        vo.setReserve(param.getReserve());
         //redis
         redisUtils.setMixDetails(param.getMixId(), vo);
         redisList(vo.getShowPosition(), vo.getMixId(), vo.getStatus());
@@ -246,7 +247,7 @@ public class GoblinMixServiceImpl implements IGoblinMixService {
         mongoUtils.changeGoblinMixDetailsVo(vo);
         //sql入库
         queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_STORE_MARKET.getKey(),
-                SqlMapping.get("goblin_mix_update", vo.getShowPosition(), vo.getLimit(), vo.getWhiteType(), vo.getWhiteUrl(), LocalDateTime.now(), vo.getShelvesTime(), param.getMixId()));
+                SqlMapping.get("goblin_mix_update", vo.getShowPosition(), vo.getLimit(), vo.getWhiteType(), vo.getWhiteUrl(), LocalDateTime.now(), vo.getShelvesTime(), vo.getReserve(), param.getMixId()));
         return ResponseDto.success();
     }
 

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

@@ -151,7 +151,7 @@ goblin_list_detail_insert=INSERT INTO goblin_list_details (`list_id`,`spu_id`,`s
 goblin_list_update=UPDATE goblin_list SET white_url = ? ,white_type = ? , black_url = ? , updated_at = ? WHERE list_id = ?
 goblin_list_remove=UPDATE goblin_list set del_tag = 1 , updated_at = ? WHERE list_id = ? 
 #----                       \u6DF7\u5408\u552E\u5356                             ----
-goblin_mix_insert=INSERT INTO goblin_mix (`mix_id`,`uid`,`name`,`time_start`,`time_end`,`status`,`show_position`,`sell_name`,`express_price`,`intro`,`watch_type`,`cover_pic`,`video`,`detail_url`,`details`,`stock`,`stock_lock`,`is_lock`,`limit`,`white_type`,`white_url`,`pay_type`,`store_id`,`created_at`,shelves_time,reserve) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+goblin_mix_insert=INSERT INTO goblin_mix (`mix_id`,`uid`,`name`,`time_start`,`time_end`,`status`,`show_position`,`sell_name`,`express_price`,`intro`,`watch_type`,`cover_pic`,`video`,`detail_url`,`details`,`stock`,`stock_lock`,`is_lock`,`limit`,`white_type`,`white_url`,`pay_type`,`store_id`,`created_at`,`shelves_time`,`reserve`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 goblin_mix_details_insert=INSERT INTO goblin_mix_details (`mix_id`,`position`,`spu_id`,`sku_id`,`price`,`price_v`,`product_id`,`count`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?)
 goblin_mix_status_update=UPDATE goblin_mix SET status = ? , updated_at = ? WHERE mix_id = ?
-goblin_mix_update=UPDATE goblin_mix SET show_position = ? , `limit`=?,white_type=?,white_url=? , updated_at = ?,shelves_time = ? WHERE mix_id = ?
+goblin_mix_update=UPDATE goblin_mix SET show_position = ? , `limit`=?,white_type=?,white_url=? , updated_at = ?,shelves_time = ?,reserve = ? WHERE mix_id = ?
\ No newline at end of file