From 3abb56813fd1744a827ddbbacc2381c3e0d152c6 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 12 Sep 2019 19:02:33 +0800 Subject: [PATCH] =?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);