From 3abb56813fd1744a827ddbbacc2381c3e0d152c6 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 12 Sep 2019 19:02:33 +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=E7=BB=93=E7=AE=97=E5=8D=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxBillAllServiceImpl.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) 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 767bd2a20..0f4370806 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -194,11 +194,10 @@ public class WxBillAllServiceImpl implements WxBillAllService { 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))); + Long id = (Long)map.get("id"); + WxBillSettle settle = wxBillSettleService.getById(id,EnumFilterSettle.YES.getCode()); + BigDecimal money = new BigDecimal(settle.getBalance()).divide(new BigDecimal(100),2,BigDecimal.ROUND_HALF_UP); + map.put("owe",money); } } PageInfo> pageInfo = new PageInfo<>(maps); @@ -208,11 +207,10 @@ public class WxBillAllServiceImpl implements WxBillAllService { 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))); + Long id = (Long)map.get("id"); + WxBillSettle settle = wxBillSettleService.getById(id,EnumFilterSettle.YES.getCode()); + BigDecimal money = new BigDecimal(settle.getBalance()).divide(new BigDecimal(100),2,BigDecimal.ROUND_HALF_UP); + map.put("owe",money); } } return new ResultData(maps); From b1c7f763db21fa4f4a9845ffe6cba649489510f2 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 12 Sep 2019 19:05:06 +0800 Subject: [PATCH 2/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=E7=BB=93=E7=AE=97=E5=8D=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxBillSettleServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java index 9dd50e2b7..2abf98bc6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java @@ -169,7 +169,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(EnumBillRentStatus.PAID.getCode().equals(status)){ WxBillRent dbBill = wxBillRentMapper.selectByPrimaryKey(wxBillRent.getId()); if(dbBill!=null) { - wxBillRent.setPay(wxBillRent.getPay()+ dbBill.getOwe()); + wxBillRent.setPay(dbBill.getPay()+ dbBill.getOwe()); wxBillRent.setPayDate(new Date()); addBillAction(bill.getBillId(), dbBill.getOwe()); }