diff --git a/mallinkAdmin/src/test/java/com/iformall/service/test/Test.java b/mallinkAdmin/src/test/java/com/iformall/service/test/Test.java index e6c52e3f8..c6a4fd538 100644 --- a/mallinkAdmin/src/test/java/com/iformall/service/test/Test.java +++ b/mallinkAdmin/src/test/java/com/iformall/service/test/Test.java @@ -148,6 +148,8 @@ public class Test { WxBillAll wxBillAll = new WxBillAll(); wxBillAll.setTenantId("456"); wxBillAll.setMerchantId(324754110547066880l); + wxBillAll.setPageIndex(1); + wxBillAll.setPageSize(6); System.out.println("--------"+JsonUtil.obj2Json(wxBillAllService.listBill(wxBillAll))); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index f3fedadf9..1aa9ad298 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -191,6 +191,16 @@ public class WxBillAllServiceImpl implements WxBillAllService { if (wxBillAll.getPageIndex() != null && wxBillAll.getPageIndex() != null) { PageHelper.startPage(wxBillAll.getPageIndex(), wxBillAll.getPageSize()); List> maps = wxBillAllMapper.listData(wxBillAll); + for (Map map:maps) { + Integer billType = ((Long)map.get("billTypeValue")).intValue(); + if(EnumBillType.SETTLE.getCode().equals(billType)){ + BigDecimal rp = (BigDecimal)map.get("receivePay"); + WxBillSettle query = new WxBillSettle(); + query.setId((Long)map.get("id")); + Long sum = wxBillSettleRecordMapper.getSumMoneyBySettleId(query); + map.put("owe",rp.subtract(new BigDecimal(sum))); + } + } PageInfo> pageInfo = new PageInfo<>(maps); return new ResultData(pageInfo); } diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index daea76026..e537dec06 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -811,12 +811,11 @@ left join wx_rent_contract rc on(rc.merchant_id = m.id) where m.status=1 ) tt where 1=1 - and tt.tenant_id = #{tenantId} and tt.id = #{merchantId} and tt.name like concat('%', #{merchantName},'%') and tt.rent_shop_type = #{rentShopType} - + and (receivePay >0 or payOut>0) order by ${sortColumns} order by tt.id desc