Merge remote-tracking branch 'origin/pre' into pre

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

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * @Author: GH
@@ -34,4 +35,7 @@ public class GoblinGoodAnticipateUserVo implements Serializable {
 
     @ApiModelProperty(value = "用户状态")
     private Integer state;
+
+    @ApiModelProperty(value = "用户预约时间")
+    private LocalDateTime createdDate;
 }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/docu/db_0315_jxl_nft.sql

@@ -220,10 +220,10 @@ CREATE TABLE `goblin_goods_anticipate_user`  (
                                                  `phone` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '手机号',
                                                  `sku_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'sku_id',
                                                  `state` int NOT NULL DEFAULT 0 COMMENT '状态（0：正常（默认））',
+                                                 `created_date` datetime NULL DEFAULT NULL COMMENT '创建时间',
                                                  PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '预约表关联user表' ROW_FORMAT = Dynamic;
 
-
 # -- >>------------------------------------------------------------------------------------
 
 DROP TABLE IF EXISTS `goblin_goods_anticipate_value`;

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

@@ -17,6 +17,7 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.LinkedList;
 
 /**
@@ -64,6 +65,7 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
                 String mobile = StringUtils.defaultString(((String) CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_MOBILE)), "");
                 user.setPhone(mobile);
                 user.setState(0);
+                user.setCreatedDate(LocalDateTime.now());
                 //mongodb记录
                 goblinRedisUtils.setUserAboutSku(user);
                 //用户没有预约过
@@ -72,7 +74,8 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
                         user.getUid(),
                         skuId,
                         user.getPhone(),
-                        0
+                        0,
+                        user.getCreatedDate()
                 });
                 sendRedis("goblin_goods_anticipate_user", sqlValue);
                 goblinRedisUtils.setSkuIdPeople(skuId);

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

@@ -139,6 +139,6 @@ goblin_goods_anticipate=INSERT INTO goblin_goods_anticipate(ant_id,`rule`,create
 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(?,?,?,?) 
+goblin_goods_anticipate_user=INSERT INTO goblin_goods_anticipate_user(uid,sku_id,phone,state,created_date) VALUES(?,?,?,?,?) 
 goblin_goods_anticipate_user_update=UPDATE goblin_goods_anticipate_user SET state = 1 WHERE uid = ? AND sku_id = ? 
 goblin_goods_anticipate_user_update_sku=UPDATE goblin_goods_anticipate_user SET state = 1 WHERE sku_id = ?