MIX组合购新增预约开启字段,原上架字段补充

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

@@ -51,6 +51,10 @@ public class GoblinMixAppDetailsVo implements Serializable, Cloneable {
     private BigDecimal sellPrice;
     @ApiModelProperty(position = 23, value = "原价")
     private BigDecimal price;
+    @ApiModelProperty(position = 22, value = "上架时间")
+    private String shelvesTime;
+    @ApiModelProperty(position = 23, value = "预约开启标识[0:未开启，1开启]")
+    private int reserve;
 
     private static final GoblinMixAppDetailsVo obj = new GoblinMixAppDetailsVo();
 
@@ -82,6 +86,8 @@ public class GoblinMixAppDetailsVo implements Serializable, Cloneable {
         this.setStoreName(storeName);
         this.setPrice(source.getPrice());
         this.setSellPrice(source.getSellPrice());
+        this.setShelvesTime(source.getShelvesTime());
+        this.setReserve(source.getReserve());
         return this;
     }
 }

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

@@ -37,6 +37,8 @@ public class GoblinMixAppListVo implements Serializable, Cloneable {
     private String nowTime;
     @ApiModelProperty(position = 22, value = "上架时间")
     private String shelvesTime;
+    @ApiModelProperty(position = 23, value = "预约开启标识[0:未开启，1开启]")
+    private int reserve;
 
     private static final GoblinMixAppListVo obj = new GoblinMixAppListVo();
 
@@ -61,6 +63,7 @@ public class GoblinMixAppListVo implements Serializable, Cloneable {
         this.setCreatedAt(source.getCreatedAt());
         this.setShelvesTime(source.getShelvesTime());
         this.setNowTime(nowTime);
+        this.setReserve(source.getReserve());
         return this;
     }
 }

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

@@ -72,6 +72,8 @@ public class GoblinMixDetailsVo implements Serializable, Cloneable {
     private String storeId;
     @ApiModelProperty(position = 22, value = "上架时间")
     private String shelvesTime;
+    @ApiModelProperty(value = "预约开启标识")
+    private int reserve;
 
     private static final GoblinMixDetailsVo obj = new GoblinMixDetailsVo();
 

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinMixDetailsParam.java

@@ -55,7 +55,8 @@ public class GoblinMixDetailsParam implements Serializable, Cloneable {
     private String storeId;
     @ApiModelProperty(position = 22, value = "上架时间")
     private String shelvesTime;
-
+    @ApiModelProperty(position = 23, value = "预约开启标识[0:未开启，1开启]")
+    private int reserve;
 
     private static final GoblinMixDetailsParam obj = new GoblinMixDetailsParam();
 

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinMixUpdateParam.java

@@ -24,6 +24,8 @@ public class GoblinMixUpdateParam implements Serializable, Cloneable {
     private String xlsName;
     @ApiModelProperty(position = 22, value = "上架时间")
     private String shelvesTime;
+    @ApiModelProperty(position = 23, value = "预约开启标识[0:未开启，1开启]")
+    private int reserve;
 
     private static final GoblinMixUpdateParam obj = new GoblinMixUpdateParam();
 

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

@@ -72,7 +72,7 @@ public class GoblinJobServiceImpl {
         LocalDateTime nt = LocalDateTime.now();
         //筛选 活动中 和 活动中且售罄的
         for (GoblinMixDetailsVo item : nftDetailsList) {
-            LocalDateTime st = LocalDateTime.parse(item.getTimeStart(), DTF_YMD_HMS);
+            LocalDateTime st = LocalDateTime.parse(item.getTimeStartOrShelvesTime(item), DTF_YMD_HMS);
             LocalDateTime et = LocalDateTime.parse(item.getTimeEnd(), DTF_YMD_HMS);
             if (nt.isAfter(st) && nt.isBefore(et)) {//活动中
                 int stock = 0;

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

@@ -195,7 +195,7 @@ public class GoblinMixServiceImpl implements IGoblinMixService {
                 mixId, uid, vo.getName(), vo.getTimeStart(), vo.getTimeEnd(), 6, vo.getShowPosition(),
                 vo.getSellName(), vo.getExpressPrice(), vo.getIntro(), vo.getWatchType(), vo.getCoverPic(),
                 vo.getVideo(), vo.getDetailUrl(), vo.getDetails(), vo.getStock(), vo.getStockLock(),
-                vo.getIsLock(), vo.getLimit(), vo.getWhiteType(), vo.getWhiteUrl(), vo.getPayType(), vo.getStoreId(), LocalDateTime.now(), vo.getShelvesTime()
+                vo.getIsLock(), vo.getLimit(), vo.getWhiteType(), vo.getWhiteUrl(), vo.getPayType(), vo.getStoreId(), LocalDateTime.now(), vo.getShelvesTime(), vo.getReserve()
         });
         //设置redis
         redisUtils.setMixDetails(mixId, vo);

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

@@ -150,7 +150,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`,) 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 = ?
\ No newline at end of file