优惠券新增字段修改

alien-entity/src/main/java/shop/alien/entity/store/LifeDiscountCoupon.java

@@ -108,7 +108,7 @@ public class LifeDiscountCoupon extends Model<LifeDiscountCoupon> {
 
     @ApiModelProperty(value = "指定天数")
     @TableField("specified_day")
-    private Integer specifiedDay;
+    private String specifiedDay;
 
     @ApiModelProperty(value = "是否可以叠加其他优惠券使用")
     @TableField("is_overlay")
@@ -134,6 +134,10 @@ public class LifeDiscountCoupon extends Model<LifeDiscountCoupon> {
     @TableField(value = "end_get_date", fill = FieldFill.INSERT_UPDATE)
     private LocalDate endGetDate;
 
+    @ApiModelProperty(value = "自定义领取规则数量")
+    @TableField("claim_rule_customize_value")
+    private Integer claimRuleCustomizeValue;
+
     @Override
     protected Serializable pkVal() {
         return this.id;

alien-entity/src/main/java/shop/alien/entity/store/LifeDiscountCouponQuantumRules.java

@@ -2,6 +2,7 @@ package shop.alien.entity.store;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,6 +10,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -62,11 +64,13 @@ public class LifeDiscountCouponQuantumRules extends Model<LifeDiscountCouponQuan
 
     @ApiModelProperty(value = "开始时间段")
     @TableField(value = "begin_time_quantum", fill = FieldFill.INSERT)
-    private Date beginTimeQuantum;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime beginTimeQuantum;
 
     @ApiModelProperty(value = "结束时间段")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     @TableField(value = "end_time_quantum", fill = FieldFill.INSERT)
-    private Date endTimeQuantum;
+    private LocalDateTime  endTimeQuantum;
     @Override
     protected Serializable pkVal() {
         return this.id;

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

@@ -79,7 +79,7 @@ public class LifeDiscountCouponDto {
     private List<String> holidayDisabledList;
 
     @ApiModelProperty(value = "指定天数")
-    private Integer specifiedDay;
+    private String specifiedDay;
 
     @ApiModelProperty(value = "是否可以叠加其他优惠券使用，0，是，1否")
     private Integer isOverlay;

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

@@ -125,7 +125,7 @@ public class LifeDiscountCouponVo {
     private String applicationScopeValue;
 
     @ApiModelProperty(value = "指定天数")
-    private Integer specifiedDay;
+    private String specifiedDay;
 
     @ApiModelProperty(value = "是否可以叠加其他优惠券使用，0，是，1否")
     private Integer isOverlay;

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

@@ -169,7 +169,7 @@ public class LifeDiscountCouponServiceImpl extends ServiceImpl<LifeDiscountCoupo
             // 删除时间段规则信息
             LambdaQueryWrapper<LifeDiscountCouponQuantumRules> lifeDiscountCouponQuantumRulesLambdaQueryWrapper = new LambdaQueryWrapper<>();
             lifeDiscountCouponQuantumRulesLambdaQueryWrapper.eq(LifeDiscountCouponQuantumRules::getDiscountCouponId, lifeDiscountCoupon.getId());
-            lifeDiscountCouponUnavailableRulesMapper.delete(queryWrapper);
+            lifeDiscountCouponQuantumRulesMapper.delete(lifeDiscountCouponQuantumRulesLambdaQueryWrapper);
 
             //指定时间段可用规则
             List<LifeDiscountCouponQuantumRules> availableTimeQuantumList =  lifeDiscountCouponDto.getAvailableTimeQuantum();