添加券:生效｜失效时间字段赋值逻辑调整;

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

@@ -79,33 +79,40 @@ public class CandyMgtCoupon1AdminController extends BaseController {
     public AjaxResult addSave(@Validated CandyMgtCouponBuildParam buildParam) {
         BigDecimal discount = null, valFace = null, valOver = null, valMinus = null;
         Integer couType = buildParam.getCouType(),
+                bindType = buildParam.getBindType(),
                 validity = buildParam.getValidity(),
                 redeemValidity = buildParam.getRedeemValidity();
         LocalDateTime nowTime = LocalDateTime.now(),
-                redeemStart = null, redeemStop = null, effectAt, expireAt,
+                redeemStart = null, redeemStop = null, effectAt = null, expireAt = null,
                 eventAt = LocalDateTime.parse(buildParam.getEventAt(), DateTimeFormatter.ofPattern(DateUtils.YYYY_MM_DD_HH_MM_SS));
 
-        switch (couType) {// TODO: 2021/8/20 校验
-            case 1:// 代金券
+        switch (couType) {// 券类型[1-代金券｜2-满减券｜3-兑换券｜4-折扣券] TODO: 2021/8/20 校验
+            case 1:
                 valFace = buildParam.getValFace();
                 break;
-            case 2:// 满减券
+            case 2:
                 valOver = buildParam.getValOver();
                 valMinus = buildParam.getValMinus();
                 break;
-            case 3:// 兑换券
+            case 3:
                 redeemStart = eventAt.with(LocalTime.MIN);
                 redeemStop = eventAt.plusDays(redeemValidity).withHour(23).withMinute(59).withSecond(59);
                 break;
-            case 4:// 折扣券
+            case 4:
                 discount = buildParam.getDiscount();
                 break;
             default:
                 logger.warn("Invalid operation[buildParam.couType={}]", couType);
                 return this.error(AjaxResult.Type.WARN, "券类型无效");
         }
+        switch (bindType) {// 领取方式[0-用户输入兑换｜1-发放至用户]
+//            case 0:// 实际兑换发生时，计算到期时间
+//                break;
+            case 1:
                 effectAt = eventAt.with(LocalTime.MIN);
                 expireAt = eventAt.plusDays(validity).withHour(23).withMinute(59).withSecond(59);
+                break;
+        }
 
         StringBuilder eventLimit = new StringBuilder();
         String operator = ShiroUtils.getLoginName();

liquidnet-bus-feign/liquidnet-api-feign-platform/src/main/java/com/liquidnet/service/feign/platform/task/FeignPlatformCandyTaskClient.java

@@ -15,6 +15,15 @@ import org.springframework.web.bind.annotation.PutMapping;
 )
 public interface FeignPlatformCandyTaskClient {
 
-    @PutMapping("/ccoupon/mgt/task/issue/coupons")
+    @PutMapping("ccoupon/task/mgt/issue/coupons")
     ResponseDto<String> issueCoupons();
+
+    @PutMapping("ccoupon/task/due/redeem")
+    ResponseDto<String> processForRedeem();
+
+    @PutMapping("ccoupon/task/due/common")
+    ResponseDto<String> processForCommon();
+
+    @PutMapping("ccoupon/task/due/user")
+    ResponseDto<String> processForUser();
 }

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

@@ -18,7 +18,7 @@ import java.util.List;
 
 @Slf4j
 @RestController
-@RequestMapping("ccoupon/mgt/task")
+@RequestMapping("ccoupon/task/mgt")
 public class CandyMgtCouponTaskController {
     @Autowired
     private PlatformCandyMgtCouponService platformCandyMgtCouponService;