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 4b49166fd..4dc679536 100644 Binary files a/mallinkService/src/main/resources/contract-word-template/bill_owe.docx and b/mallinkService/src/main/resources/contract-word-template/bill_owe.docx differ 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 000000000..fcd42e3fa Binary files /dev/null and b/mallinkService/src/main/resources/contract-word-template/~$ll_owe.docx differ 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