Просмотр исходного кода

[合同][修改][创建账单添加手续费]

release_toaliyun_real
gongbiao 6 лет назад
Родитель
Сommit
3a71ddf935
2 измененных файлов: 11 добавлений и 2 удалений
  1. +4
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  2. +7
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 4
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java Просмотреть файл

@@ -219,6 +219,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
return;
}
wxBillPropertyMapper.deletePreviewBill(record);
WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(record.getTenantId());
final IdWorker idWorker = IdWorker.get();
int count = 1;
for (WxBillProperty bill:record.getPreviewBillRentList()) {
@@ -245,6 +246,9 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
bill.setStatus(EnumBillRentStatus.PAID.getCode());
bill.setPayDate(date);
}
BigDecimal servicePay = new BigDecimal(bill.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP);
bill.setServiceChargePay(servicePay.intValue());
bill.setOwe(bill.getReceivePay() + bill.getServiceChargePay());
count++;
}
wxBillPropertyMapper.insertBills(record.getPreviewBillRentList());


+ 7
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Просмотреть файл

@@ -1,6 +1,5 @@
package com.iformall.service.impl;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -628,10 +627,12 @@ public class WxRentContractServiceImpl implements WxRentContractService {
* 重新生成账单(预账单调整)
*/
public void savePreviewBill(WxRentContract record){

if(CollectionUtils.isEmpty(record.getPreviewBillRentList())){
return;
}
wxBillRentMapper.deletePreviewBill(record);
WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(record.getTenantId());
final IdWorker idWorker = IdWorker.get();
int count = 1;
for (WxBillRent bill:record.getPreviewBillRentList()) {
@@ -640,7 +641,6 @@ public class WxRentContractServiceImpl implements WxRentContractService {
bill.setRentContractId(record.getId());
bill.setCreatetime(date);
bill.setTenantId(record.getTenantId());
bill.setOwe(bill.getReceivePay());
bill.setNeedPay(bill.getNeedPay());
bill.setUpdatetime(date);
bill.setRentShopType(record.getRentShopType());
@@ -657,6 +657,10 @@ public class WxRentContractServiceImpl implements WxRentContractService {
bill.setStatus(EnumBillRentStatus.PAID.getCode());
bill.setPayDate(date);
}
//计算手续费
BigDecimal servicePay = new BigDecimal(bill.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP);
bill.setServiceChargePay(servicePay.intValue());
bill.setOwe(bill.getReceivePay() + bill.getServiceChargePay());
count++;
}
wxBillRentMapper.insertBills(record.getPreviewBillRentList());
@@ -1330,6 +1334,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
//计算手续费
BigDecimal servicePay = new BigDecimal(wxBillRent.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP);
wxBillRent.setServiceChargePay(servicePay.intValue());
wxBillRent.setOwe(wxBillRent.getReceivePay() + wxBillRent.getServiceChargePay());
resultList.add(wxBillRent);
}



Загрузка…
Отмена
Сохранить