券相关ID生成调整;

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/admin/AdamMemberBuildParam.java

@@ -30,10 +30,10 @@ public class AdamMemberBuildParam implements Serializable {
     private String notes;
     @ApiModelProperty(required = true, value = "限购数量，0不限购[200]", example = "0")
     private Integer limitation;
-    @ApiModelProperty(required = false, value = "限购开始时间[yyyy-MM-dd]", example = "2021-08-24")
+    @ApiModelProperty(required = false, value = "限购开始时间[yyyy-MM-dd]")
     private String limitbAt;
-    @ApiModelProperty(required = false, value = "限购结束时间[yyyy-MM-dd]", example = "2021-09-24")
+    @ApiModelProperty(required = false, value = "限购结束时间[yyyy-MM-dd]")
     private String limiteAt;
-    @ApiModelProperty(required = true, value = "是否开售:1-开售｜2-停售", example = "2021-09-24")
+    @ApiModelProperty(required = true, value = "是否开售:1-开售｜2-停售")
     private Integer onsale;
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamMemberAdminController.java

@@ -203,7 +203,7 @@ public class AdamMemberAdminController extends BaseController {
             if (!CollectionUtils.isEmpty(couponRuleList)) {
                 couponRuleList.forEach(r -> {
                     CandyCouponRule initCouponRule = new CandyCouponRule();
-                    initCouponRule.setCruleId(IDGenerator.nextMilliId());
+                    initCouponRule.setCruleId(IDGenerator.nextTimeId2());
                     initCouponRule.setCouponId(initCoupon.getCouponId());
                     initCouponRule.setUseScope(r.getUseScope());
                     initCouponRule.setBusiName(r.getBusiName());
@@ -253,7 +253,7 @@ public class AdamMemberAdminController extends BaseController {
                 if (!CollectionUtils.isEmpty(couponRuleList)) {
                     couponRuleList.forEach(r -> {
                         CandyCouponRule initCouponRule = new CandyCouponRule();
-                        initCouponRule.setCruleId(IDGenerator.nextMilliId());
+                        initCouponRule.setCruleId(IDGenerator.nextTimeId2());
                         initCouponRule.setCouponId(couponId);
                         initCouponRule.setUseScope(r.getUseScope());
                         initCouponRule.setBusiName(r.getBusiName());

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/candy/CandyMgtCouponAdminController.java

@@ -146,7 +146,7 @@ public class CandyMgtCouponAdminController extends BaseController {
         if (!CollectionUtils.isEmpty(couponRuleList)) {
             couponRuleList.forEach(r -> {
                 CandyCouponRule initCouponRule = new CandyCouponRule();
-                initCouponRule.setCruleId(IDGenerator.nextMilliId());
+                initCouponRule.setCruleId(IDGenerator.nextTimeId2());
                 initCouponRule.setCouponId(initCoupon.getCouponId());
                 initCouponRule.setUseScope(r.getUseScope());
                 initCouponRule.setBusiName(r.getBusiName());

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberServiceAdminImpl.java

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 @Slf4j
@@ -51,6 +52,9 @@ public class AdamMemberServiceAdminImpl extends ServiceImpl<AdamMemberMapper, Ad
     public boolean edit(AdamMemberBuildParam parameter) {
         AdamMember adamMember = new AdamMember();
         BeanUtils.copyProperties(parameter, adamMember);
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        adamMember.setLimitbAt(LocalDateTime.parse(parameter.getLimitbAt(), dateTimeFormatter));
+        adamMember.setLimiteAt(LocalDateTime.parse(parameter.getLimitbAt(), dateTimeFormatter));
         adamMember.setUpdatedAt(LocalDateTime.now());
         AdamMemberVo vo = AdamMemberVo.getNew().copy(adamMember);
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/candy/task/CandyCouponDueTaskController.java

@@ -9,7 +9,9 @@ import com.liquidnet.service.candy.constant.CandyRedisConst;
 import com.liquidnet.service.candy.dto.CandyCommonCouponBasicDto;
 import com.liquidnet.service.candy.entity.CandyCommonCoupon;
 import com.liquidnet.service.candy.entity.CandyCoupon;
+import com.liquidnet.service.candy.entity.CandyCouponCode;
 import com.liquidnet.service.platform.service.impl.candy.PlatformCandyCommonCouponService;
+import com.liquidnet.service.platform.service.impl.candy.PlatformCandyCouponCodeService;
 import com.liquidnet.service.platform.service.impl.candy.PlatformCandyCouponService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,6 +49,8 @@ public class CandyCouponDueTaskController {
     private PlatformCandyCouponService platformCandyCouponService;
     @Autowired
     private PlatformCandyCommonCouponService platformCandyCommonCouponService;
+    @Autowired
+    private PlatformCandyCouponCodeService platformCandyCouponCodeService;
 
     /**
      * <p>
@@ -61,7 +65,8 @@ public class CandyCouponDueTaskController {
     public ResponseDto<String> processForRedeem() {
         LocalDateTime now = LocalDateTime.now();
 
-
+        LambdaQueryWrapper<CandyCouponCode> couponCodeQueryWrapper = Wrappers.lambdaQuery(CandyCouponCode.class);
+        couponCodeQueryWrapper.eq(CandyCouponCode::getState, 1);
 
         return ResponseDto.success();
     }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/candy/PlatformCandyCouponService.java

@@ -132,7 +132,7 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
 
         for (int i = 0; i < eventAmt; i++) {
             CandyCommonCoupon commonCoupon = new CandyCommonCoupon();
-            commonCoupon.setCcouponId(IDGenerator.nextMilliId());
+            commonCoupon.setCcouponId(IDGenerator.nextTimeId2());
             commonCoupon.setMcouponId(mgtCoupon.getMcouponId());
             commonCoupon.setCouponId(coupon.getCouponId());
             commonCoupon.setState(1);