diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java index 1886954dd..d1dfd77be 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java +++ b/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.vo.WxCouponPasswordCountInfoVO; import com.iformall.domain.vo.WxCouponPasswordVo; +import com.iformall.enums.EnumCouponPasswordStatus; import com.iformall.service.WxCouponPasswordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -88,6 +89,12 @@ public class WxCouponPasswordController extends BaseController { public ResultData batchList(@ModelAttribute WxCouponPassword wxCouponPassword, Integer pageNum, Integer pageSize) { wxCouponPassword.updateTenantInfo(getTenantInfo()); 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 page = wxCouponPasswordService.listVoAsPage(wxCouponPassword, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java index f06aa9cdb..9ec4d5432 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java @@ -9,6 +9,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.util.Date; +import java.util.List; @TableName(value = "wx_coupon_password") @Data @@ -31,6 +32,8 @@ public class WxCouponPassword extends TenantEntity { @Excel(name = "状态", width = 20, replace = {"初始_0", "发送中_1", "已发出_2", "已使用_3", "不可用_4"}, orderNum = "4") @io.swagger.annotations.ApiModelProperty(value="卡密状态: 0初始1信息发出中2信息已发出3已使用4已过期",name="status") private Integer status; + @TableField(exist = false) + private List statusList; @Excel(name = "发送手机", width = 20, orderNum = "5") @io.swagger.annotations.ApiModelProperty(value="卡密发送到手机",name="sendedPhone") private String sendedPhone;