Bläddra i källkod

[卡密][修改]:默认添加过期时间,导出修改

release_toaliyun_real
Stormeye Wu 6 år sedan
förälder
incheckning
838d015c91
2 ändrade filer med 6 tillägg och 1 borttagningar
  1. +4
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java

+ 4
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java Visa fil

@@ -30,8 +30,10 @@ public class WxCouponPassword extends BaseEntity {
@Excel(name = "兑换码", width = 20, orderNum = "1") @Excel(name = "兑换码", width = 20, orderNum = "1")
@io.swagger.annotations.ApiModelProperty(value="商户名称",name="password") @io.swagger.annotations.ApiModelProperty(value="商户名称",name="password")
private String password; private String password;
@io.swagger.annotations.ApiModelProperty(value="卡密状态: 0初始1信息发出中2信息已发出3已使用",name="status")
@Excel(name = "状态", width = 20, replace = {"初始_0", "发送中_1", "已发出_2", "已使用_3", "不可用_4"}, orderNum = "3")
@io.swagger.annotations.ApiModelProperty(value="卡密状态: 0初始1信息发出中2信息已发出3已使用4已过期",name="status")
private Integer status; private Integer status;
@Excel(name = "发送手机", width = 20, orderNum = "4")
@io.swagger.annotations.ApiModelProperty(value="卡密发送到手机",name="sendedPhone") @io.swagger.annotations.ApiModelProperty(value="卡密发送到手机",name="sendedPhone")
private String sendedPhone; private String sendedPhone;
@io.swagger.annotations.ApiModelProperty(value="卡包ID(coupon_order_id/card_id)",name="cardId") @io.swagger.annotations.ApiModelProperty(value="卡包ID(coupon_order_id/card_id)",name="cardId")
@@ -40,6 +42,7 @@ public class WxCouponPassword extends BaseEntity {
private Date createDate; private Date createDate;
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")
private Date updateDate; private Date updateDate;
@Excel(name="过期时间",width = 20,format="yyyy-MM-dd", orderNum = "2")
@io.swagger.annotations.ApiModelProperty(value="过期时间",name="expireDate") @io.swagger.annotations.ApiModelProperty(value="过期时间",name="expireDate")
private Date expireDate; private Date expireDate;




+ 2
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java Visa fil

@@ -11,6 +11,7 @@ import com.iformall.exception.MallinkException;
import com.iformall.mapper.WxCouponPasswordMapper; import com.iformall.mapper.WxCouponPasswordMapper;
import com.iformall.service.ExcelService; import com.iformall.service.ExcelService;
import com.iformall.service.WxCouponPasswordService; import com.iformall.service.WxCouponPasswordService;
import com.iformall.utils.DateUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -146,6 +147,7 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService {
newOne.setStatus(EnumCouponPasswordStatus.INIT.getCode()); newOne.setStatus(EnumCouponPasswordStatus.INIT.getCode());
newOne.setCreateDate(curDate); newOne.setCreateDate(curDate);
newOne.setUpdateDate(curDate); newOne.setUpdateDate(curDate);
newOne.setExpireDate(DateUtils.getTimeAfterDays(30, curDate));
couponPasswords.add(newOne); couponPasswords.add(newOne);
} }
wxCouponPasswordMapper.insertCouponPasswds(couponPasswords); wxCouponPasswordMapper.insertCouponPasswds(couponPasswords);


Laddar…
Avbryt
Spara