diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java index 403e2cb34..648a920b3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java @@ -10,6 +10,7 @@ import com.iformall.domain.vo.FinanceSetOffDetailVo; import com.iformall.domain.vo.WxBillFeesStandardsListVo; import com.iformall.enums.EnumBillAction; import com.iformall.enums.EnumBillAllType; +import com.iformall.enums.EnumBillStatus; import lombok.Data; import lombok.EqualsAndHashCode; @@ -135,6 +136,14 @@ public class WxAllBill extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "账单状态EnumBillStatus", name = "status") public Integer status; @TableField(exist = false) + private String statusName; + public String getStatusName() { + if (null != status) { + return EnumBillStatus.getEnum(status).getMessage(); + } + return null; + } + @TableField(exist = false) public List statusList; @io.swagger.annotations.ApiModelProperty(value = "费用科目", name = "energyFeesId") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java index 33a6a3b0c..1a747919d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java @@ -156,16 +156,15 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill @Override public PageInfo listAsPage(WxAllBill record, Integer pageIndex, Integer pageSize) { updateQueryParam(record); - PageInfo billRentList = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxAllBillMapper.findList(record)); - if (null == billRentList) { + PageInfo page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxAllBillMapper.findList(record)); + if (null == page) { return null; } - Map rentContractMap = new HashMap(); - if (null != billRentList.getList()) { + if (null != page.getList() && page.getList().size() > 0 ) { List merchantIds = new ArrayList(); - for (int i = 0 ; i < billRentList.getList().size() ; i ++) { - WxAllBill ab = billRentList.getList().get(i); + for (int i = 0 ; i < page.getList().size() ; i ++) { + WxAllBill ab = page.getList().get(i); merchantIds.add(ab.getMerchantId()); } @@ -178,8 +177,8 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill WxEnergyFees fq = new WxEnergyFees(); fq.updateTenantInfo(record); Map feesMap = wxEnergyService.getFeesMap(fq); - for (int i = 0 ; i < billRentList.getList().size() ; i ++) { - WxAllBill e = billRentList.getList().get(i); + for (int i = 0 ; i < page.getList().size() ; i ++) { + WxAllBill e = page.getList().get(i); if (null != shopNumberMap) { e.setShopNumber(shopNumberMap.get(e.getMerchantId())); } @@ -197,7 +196,7 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill } } } - return billRentList; + return page; } @Override