Просмотр исходного кода

fix card

release_toaliyun_real
lin 3 лет назад
Родитель
Сommit
2dc71c2c7d
2 измененных файлов: 10 добавлений и 0 удалений
  1. +7
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java

+ 7
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java Просмотреть файл

@@ -9,6 +9,7 @@ import com.iformall.domain.po.base.BaseEntity;
import com.iformall.domain.po.WxCouponPassword; import com.iformall.domain.po.WxCouponPassword;
import com.iformall.domain.vo.WxCouponPasswordCountInfoVO; import com.iformall.domain.vo.WxCouponPasswordCountInfoVO;
import com.iformall.domain.vo.WxCouponPasswordVo; import com.iformall.domain.vo.WxCouponPasswordVo;
import com.iformall.enums.EnumCouponPasswordStatus;
import com.iformall.service.WxCouponPasswordService; import com.iformall.service.WxCouponPasswordService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
@@ -88,6 +89,12 @@ public class WxCouponPasswordController extends BaseController {
public ResultData batchList(@ModelAttribute WxCouponPassword wxCouponPassword, Integer pageNum, Integer pageSize) { public ResultData batchList(@ModelAttribute WxCouponPassword wxCouponPassword, Integer pageNum, Integer pageSize) {
wxCouponPassword.updateTenantInfo(getTenantInfo()); wxCouponPassword.updateTenantInfo(getTenantInfo());
wxCouponPassword.setSortColumns(BaseEntity.SortField.CreateDate_DESC); wxCouponPassword.setSortColumns(BaseEntity.SortField.CreateDate_DESC);
StringBuffer statussb = new StringBuffer();
statussb.append(EnumCouponPasswordStatus.MSG_SENDED.getCode()).append(",")
.append(EnumCouponPasswordStatus.MSG_SENDING.getCode()).append(",")
.append(EnumCouponPasswordStatus.USED.getCode()).append(",")
.append(EnumCouponPasswordStatus.CANCEL.getCode());
wxCouponPassword.setStatusStr(statussb.toString());
final PageInfo<WxCouponPasswordVo> page = wxCouponPasswordService.listVoAsPage(wxCouponPassword, pageNum, pageSize); final PageInfo<WxCouponPasswordVo> page = wxCouponPasswordService.listVoAsPage(wxCouponPassword, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java Просмотреть файл

@@ -9,6 +9,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


import java.util.Date; import java.util.Date;
import java.util.List;


@TableName(value = "wx_coupon_password") @TableName(value = "wx_coupon_password")
@Data @Data
@@ -31,6 +32,8 @@ public class WxCouponPassword extends TenantEntity {
@Excel(name = "状态", width = 20, replace = {"初始_0", "发送中_1", "已发出_2", "已使用_3", "不可用_4"}, orderNum = "4") @Excel(name = "状态", width = 20, replace = {"初始_0", "发送中_1", "已发出_2", "已使用_3", "不可用_4"}, orderNum = "4")
@io.swagger.annotations.ApiModelProperty(value="卡密状态: 0初始1信息发出中2信息已发出3已使用4已过期",name="status") @io.swagger.annotations.ApiModelProperty(value="卡密状态: 0初始1信息发出中2信息已发出3已使用4已过期",name="status")
private Integer status; private Integer status;
@TableField(exist = false)
private List<Integer> statusList;
@Excel(name = "发送手机", width = 20, orderNum = "5") @Excel(name = "发送手机", width = 20, orderNum = "5")
@io.swagger.annotations.ApiModelProperty(value="卡密发送到手机",name="sendedPhone") @io.swagger.annotations.ApiModelProperty(value="卡密发送到手机",name="sendedPhone")
private String sendedPhone; private String sendedPhone;


Загрузка…
Отмена
Сохранить