From 04ef8e762018e227b409320f68629522e1dc5594 Mon Sep 17 00:00:00 2001 From: winter Date: Tue, 3 Jan 2023 10:58:26 +0800 Subject: [PATCH] fix bug --- .../impl/WxBillDepositServiceImpl.java | 6 +++--- .../contract-word-template/bill_owe.docx | Bin 9597 -> 16727 bytes .../contract-word-template/~$ll_owe.docx | Bin 0 -> 162 bytes .../main/resources/mapper/WxBillAllMapper.xml | 7 +++++++ 4 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 mallinkService/src/main/resources/contract-word-template/~$ll_owe.docx diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java index 1e378b98c..ed67f63fe 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -50,13 +50,13 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { @Override public PageInfo listAsPage(WxBillDeposit record, Integer pageIndex, Integer pageSize) { - //WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(record); + WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(record); PageHelper.startPage(pageIndex, pageSize); List billDepositList = wxBillDepositMapper.queryBillDepositList(record); -/* billDepositList.stream().forEach(e->{ + billDepositList.stream().forEach(e->{ //手续费 = 合同应收+手续费+滞纳金 computeTotalMoney(wxPayAccountBill, e); - });*/ + }); PageInfo pageInfo = new PageInfo<>(billDepositList); return pageInfo; } diff --git a/mallinkService/src/main/resources/contract-word-template/bill_owe.docx b/mallinkService/src/main/resources/contract-word-template/bill_owe.docx index 4b49166fd666764dc11fd684e3d4798d3e9bcb13..4dc67953635e8f75d5bda9414b2d2b62b5f68946 100644 GIT binary patch literal 16727 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 literal 9597 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�bRQsEu$u9kXhW2}=OGMp! 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 diff --git a/mallinkService/src/main/resources/contract-word-template/~$ll_owe.docx b/mallinkService/src/main/resources/contract-word-template/~$ll_owe.docx new file mode 100644 index 0000000000000000000000000000000000000000..fcd42e3fa9819ae3c2e99e74ae57ff52b9d59275 GIT binary patch literal 162 xcmd;eOv%m6%PcM_N-W7QVjvRmGB`4%Fyu01GUNeqF+&MM5kn%7%m>oc1^`8%3f%wz literal 0 HcmV?d00001 diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 7dd5c3b9d..3e84046f2 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -925,6 +925,9 @@ select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay,late_pay_price from wx_bill_rent where is_preview = 0 and status not in(3,6) union all + select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay,late_pay_price from + wx_bill_rent_manage where status not in(3,6) + union all select merchant_id,receive_pay,0 receivePay,0 late_pay_price from wx_bill_rent_deposit where status not in(3,6) union all @@ -963,6 +966,10 @@ wx_bill_rent where is_preview = 0 and status not in(3,6) union all + select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay,late_pay_price from + wx_bill_rent_manage + where status not in(3,6) + union all select merchant_id,receive_pay,0 receivePay,0 late_pay_price from wx_bill_rent_deposit where status not in(3,6) union all