From 760a7fb179f702fbe3bbbb916d2fe92112acfbd5 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 12 Sep 2019 19:36:39 +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 --- .../iformall/service/impl/WxBillAllServiceImpl.java | 12 ++++++------ .../main/resources/mapper/WxBillSettleBillMapper.xml | 4 ++-- 2 files changed, 8 insertions(+), 8 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 514dab8fe..704f06dce 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,11 @@ public class WxBillAllServiceImpl implements WxBillAllService { for (Map map:maps) { Integer billType = ((Long)map.get("billTypeValue")).intValue(); if(EnumBillType.SETTLE.getCode().equals(billType)){ - logger.info("-----------------"); 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); + map.put("owe",settle.getBalance()); + settle = wxBillSettleService.getById(id,EnumFilterSettle.NO.getCode()); + map.put("receivePay",settle.getBalance()); } } PageInfo> pageInfo = new PageInfo<>(maps); @@ -208,11 +208,11 @@ public class WxBillAllServiceImpl implements WxBillAllService { for (Map map:maps) { Integer billType = ((Long)map.get("billTypeValue")).intValue(); if(EnumBillType.SETTLE.getCode().equals(billType)){ - logger.info("-----------------"); 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); + map.put("owe",settle.getBalance()); + settle = wxBillSettleService.getById(id,EnumFilterSettle.NO.getCode()); + map.put("receivePay",settle.getBalance()); } } return new ResultData(maps); diff --git a/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml b/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml index d3e272415..925ff783e 100644 --- a/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml @@ -111,7 +111,7 @@ union all select id, id merchant_id,'' shop_id,tenant_id,10 bill_type_value,'补贴-补贴' bill_type,0 as - need_pay,subsidy receive_pay,0 pay,0 owe,'' receive_date,'' pay_date,'' expired_day,status,'' rent_shop_type,'' starttime,'' endtime from wx_merchant_subsidy + need_pay,subsidy receive_pay,0 pay,subsidy owe,'' receive_date,'' pay_date,'' expired_day,status,'' rent_shop_type,'' starttime,'' endtime from wx_merchant_subsidy ) bill on(bl.bill_id = bill.id) where 1=1 @@ -186,7 +186,7 @@ union all select id, id merchant_id,'' shop_id,tenant_id,10 bill_type_value,'补贴-补贴' bill_type,0 as - need_pay,subsidy receive_pay,0 pay,0 owe,'' receive_date,'' pay_date,'' expired_day,status,'' rent_shop_type,'' starttime,'' endtime from wx_merchant_subsidy + need_pay,subsidy receive_pay,0 pay,subsidy owe,'' receive_date,'' pay_date,'' expired_day,status,'' rent_shop_type,'' starttime,'' endtime from wx_merchant_subsidy ) bill where 1=1