瀏覽代碼

fix bug

release_toaliyun_real
winter 3 年之前
父節點
當前提交
04ef8e7620
共有 4 個檔案被更改,包括 10 行新增3 行删除
  1. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java
  2. 二進制
      mallinkService/src/main/resources/contract-word-template/bill_owe.docx
  3. 二進制
      mallinkService/src/main/resources/contract-word-template/~$ll_owe.docx
  4. +7
    -0
      mallinkService/src/main/resources/mapper/WxBillAllMapper.xml

+ 3
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java 查看文件

@@ -50,13 +50,13 @@ public class WxBillDepositServiceImpl implements WxBillDepositService {

@Override
public PageInfo<WxBillDeposit> listAsPage(WxBillDeposit record, Integer pageIndex, Integer pageSize) {
//WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(record);
WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(record);
PageHelper.startPage(pageIndex, pageSize);
List<WxBillDeposit> billDepositList = wxBillDepositMapper.queryBillDepositList(record);
/* billDepositList.stream().forEach(e->{
billDepositList.stream().forEach(e->{
//手续费 = 合同应收+手续费+滞纳金
computeTotalMoney(wxPayAccountBill, e);
});*/
});
PageInfo<WxBillDeposit> pageInfo = new PageInfo<>(billDepositList);
return pageInfo;
}


二進制
mallinkService/src/main/resources/contract-word-template/bill_owe.docx 查看文件


二進制
mallinkService/src/main/resources/contract-word-template/~$ll_owe.docx 查看文件


+ 7
- 0
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


Loading…
取消
儲存