瀏覽代碼

//COUPON

release_toaliyun_real
xhxu 3 年之前
父節點
當前提交
1d20be8603
共有 2 個檔案被更改,包括 5 行新增3 行删除
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
  2. +3
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java

+ 2
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java 查看文件

@@ -120,9 +120,9 @@ public class WxCoupon extends TenantEntity {
private Integer sendType; private Integer sendType;
@io.swagger.annotations.ApiModelProperty(value="EnumCouponValidType 有效时间类型1.时间范围(valid_start_date,valid_end_date). 2领取后几日有效(valid_days)",name="validType") @io.swagger.annotations.ApiModelProperty(value="EnumCouponValidType 有效时间类型1.时间范围(valid_start_date,valid_end_date). 2领取后几日有效(valid_days)",name="validType")
private Integer validType; private Integer validType;
@io.swagger.annotations.ApiModelProperty(value="有效日期-开始",name="validStartDate")
@io.swagger.annotations.ApiModelProperty(value="有效日期-开始",name="validStartDate")
private Date validStartDate; private Date validStartDate;
@io.swagger.annotations.ApiModelProperty(value="有效日期-结束",name="validEndDate")
@io.swagger.annotations.ApiModelProperty(value="有效日期-结束",name="validEndDate")
private Date validEndDate; private Date validEndDate;
@io.swagger.annotations.ApiModelProperty(value="自领取之日几日有效,(停车券当天有效)",name="validDays") @io.swagger.annotations.ApiModelProperty(value="自领取之日几日有效,(停车券当天有效)",name="validDays")
private Integer validDays; private Integer validDays;


+ 3
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java 查看文件

@@ -463,8 +463,10 @@ public class WxCardInfoServiceImpl implements WxCardInfoService {
if(wxCoupon.getSubsidyNum() != null && wxCoupon.getSubsidyNum() > 0){ if(wxCoupon.getSubsidyNum() != null && wxCoupon.getSubsidyNum() > 0){
return new ResultData(ErrorCode.CARD_IS_NOT_RECHARGE.getCode(),"有补贴不支持充值"); return new ResultData(ErrorCode.CARD_IS_NOT_RECHARGE.getCode(),"有补贴不支持充值");
} }

Date currentDate = new Date(); Date currentDate = new Date();
if(currentDate.after(wxCoupon.getValidEndDate())){
return new ResultData(ErrorCode.CARD_IS_NOT_RECHARGE.getCode(),"卡已过期,不支持充值");
}


WxCardSpend record = new WxCardSpend(); WxCardSpend record = new WxCardSpend();
record.updateTenantInfo(cardInfo); record.updateTenantInfo(cardInfo);


Loading…
取消
儲存