فهرست منبع

优惠券新增草稿状态

zhangchen 4 ماه پیش
والد
کامیت
4046c0d8ef

+ 4 - 0
alien-entity/src/main/java/shop/alien/entity/store/LifeDiscountCoupon.java

@@ -138,6 +138,10 @@ public class LifeDiscountCoupon extends Model<LifeDiscountCoupon> {
     @TableField("claim_rule_customize_value")
     private Integer claimRuleCustomizeValue;
 
+    @ApiModelProperty(value = "优惠券状态:0:草稿,1:正式")
+    @TableField("coupon_status")
+    private Integer couponStatus;
+
     @Override
     protected Serializable pkVal() {
         return this.id;

+ 3 - 0
alien-entity/src/main/java/shop/alien/entity/store/dto/LifeDiscountCouponDto.java

@@ -110,4 +110,7 @@ public class LifeDiscountCouponDto {
 
     @ApiModelProperty(value = "结束领取时间")
     private LocalDate endGetDate;
+
+    @ApiModelProperty(value = "优惠券状态:0:草稿,1:正式")
+    private Integer couponStatus;
 }

+ 3 - 0
alien-entity/src/main/java/shop/alien/entity/store/vo/LifeDiscountCouponVo.java

@@ -144,4 +144,7 @@ public class LifeDiscountCouponVo {
 
     @ApiModelProperty(value = "结束领取时间")
     private LocalDate endGetDate;
+
+    @ApiModelProperty(value = "优惠券状态:0:草稿,1:正式")
+    private Integer couponStatus;
 }

+ 5 - 2
alien-store/src/main/java/shop/alien/store/service/impl/LifeDiscountCouponServiceImpl.java

@@ -81,9 +81,12 @@ public class LifeDiscountCouponServiceImpl extends ServiceImpl<LifeDiscountCoupo
             LocalDate localNow = instant.atZone(zoneId).toLocalDate();
             int startResult = localNow.compareTo(lifeDiscountCoupon.getBeginGetDate());
             int endResult = localNow.compareTo(lifeDiscountCoupon.getEndGetDate());
-            if (startResult < 0 || endResult > 0) {
+            if ((lifeDiscountCouponDto.getCouponStatus() != null && lifeDiscountCouponDto.getCouponStatus() == 0) || (startResult < 0 || endResult > 0)) {
                 lifeDiscountCoupon.setGetStatus(0);
+            } else {
+                lifeDiscountCoupon.setGetStatus(1);
             }
+
             lifeDiscountCouponMapper.insert(lifeDiscountCoupon);
             //发布优惠券规则信息
             //周中规则保存
@@ -150,7 +153,7 @@ public class LifeDiscountCouponServiceImpl extends ServiceImpl<LifeDiscountCoupo
             LocalDate localNow = instant.atZone(zoneId).toLocalDate();
             int startResult = localNow.compareTo(lifeDiscountCoupon.getBeginGetDate());
             int endResult = localNow.compareTo(lifeDiscountCoupon.getEndGetDate());
-            if (startResult < 0 || endResult > 0) {
+            if ((lifeDiscountCouponDto.getCouponStatus() != null && lifeDiscountCouponDto.getCouponStatus() == 0) || (startResult < 0 || endResult > 0)) {
                 lifeDiscountCoupon.setGetStatus(0);
             } else {
                 lifeDiscountCoupon.setGetStatus(1);