diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index 1e184dd86..1cc8afe3f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -142,8 +142,6 @@ public class WxCoupon extends TenantEntity { private String remark; @io.swagger.annotations.ApiModelProperty(value="状态(-1:全部,0:草稿/待生效,1:已生效,2:已失效,3:已作废)",name="status") private Integer status; - @TableField(exist = false) - private List statusList; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 1e0b431ce..334cc274c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -806,10 +806,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { retPageInfo.setPageSize(pageSize); retPageInfo.setPages(pageInfo.getPages()); retPageInfo.setTotal(pageInfo.getTotal()); - if (null != pageInfo && null != pageInfo.getList()){ - List volist = handleQueryResult(pageInfo.getList(), wxCouponOrderBVo); - retPageInfo.setList(volist); - } + retPageInfo.setList(handleQueryResult(pageInfo.getList(), wxCouponOrderBVo)); return new ResultData(retPageInfo); } @@ -957,7 +954,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } return retList; } - return null; + return new ArrayList<>(); } @@ -2738,9 +2735,11 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { merchantIds.add(record.getMerchantId()); List couponIds = wxCouponMerchantMapper.findMerchantProductIds(record.getTenantId(),merchantIds,null); if (null == couponIds || couponIds.isEmpty()) { + retPageInfo.setList(new ArrayList<>()); retPageInfo.setPageNum(pageIndex); retPageInfo.setPageSize(pageSize); retPageInfo.setPages(0); + retPageInfo.setTotal(0); return retPageInfo; } //查询商户下的券 @@ -2749,10 +2748,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { retPageInfo.setPageNum(pageIndex); retPageInfo.setPageSize(pageSize); retPageInfo.setPages(pageInfo.getPages()); - if (null != pageInfo && null != pageInfo.getList()){ - List volist = handleQueryResult(pageInfo.getList(), record); - retPageInfo.setList(volist); - } + retPageInfo.setTotal(pageInfo.getTotal()); + retPageInfo.setList(handleQueryResult(pageInfo.getList(), record)); return retPageInfo; }