From a4af8cb56b5b983b5ecc5037fd3324205fe72d26 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 10 Sep 2019 20:18:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8D=95][=E4=BF=AE=E6=94=B9=E8=B7=B3=E7=82=B9=E7=8E=87?= =?UTF-8?q?=E8=AE=A1=E7=AE=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/test/java/com/iformall/service/test/Test.java | 2 ++ .../iformall/service/impl/WxBillAllServiceImpl.java | 10 ++++++++++ 2 files changed, 12 insertions(+) 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); } From 998825767f8465f294dd4a07314931e236e5ede7 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 11 Sep 2019 10:06:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[BUG][=E4=BF=AE=E6=94=B9][=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=8E=AF=E5=A2=83=EF=BC=9A=E5=95=86=E6=88=B7=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E4=B8=8B-=E2=80=9C=E8=8A=B1=E8=8A=B1=E7=BE=8E?= =?UTF-8?q?=E9=A3=9F=E5=BA=97=E2=80=9D=E5=95=86=E6=88=B7=E6=9C=89=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E6=95=B0=E6=8D=AE=E4=BD=86=E6=98=AF=E5=9C=A8=E5=95=86?= =?UTF-8?q?=E6=88=B7=E8=B4=A6=E5=8D=95=E6=B2=A1=E6=98=BE=E7=A4=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxBillAllMapper.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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