|
|
@@ -1,6 +1,5 @@ |
|
|
package com.iformall.service.impl; |
|
|
package com.iformall.service.impl; |
|
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSON; |
|
|
|
|
|
import com.alibaba.fastjson.JSONArray; |
|
|
import com.alibaba.fastjson.JSONArray; |
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
@@ -628,10 +627,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
* 重新生成账单(预账单调整) |
|
|
* 重新生成账单(预账单调整) |
|
|
*/ |
|
|
*/ |
|
|
public void savePreviewBill(WxRentContract record){ |
|
|
public void savePreviewBill(WxRentContract record){ |
|
|
|
|
|
|
|
|
if(CollectionUtils.isEmpty(record.getPreviewBillRentList())){ |
|
|
if(CollectionUtils.isEmpty(record.getPreviewBillRentList())){ |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
wxBillRentMapper.deletePreviewBill(record); |
|
|
wxBillRentMapper.deletePreviewBill(record); |
|
|
|
|
|
WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(record.getTenantId()); |
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
int count = 1; |
|
|
int count = 1; |
|
|
for (WxBillRent bill:record.getPreviewBillRentList()) { |
|
|
for (WxBillRent bill:record.getPreviewBillRentList()) { |
|
|
@@ -640,7 +641,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
bill.setRentContractId(record.getId()); |
|
|
bill.setRentContractId(record.getId()); |
|
|
bill.setCreatetime(date); |
|
|
bill.setCreatetime(date); |
|
|
bill.setTenantId(record.getTenantId()); |
|
|
bill.setTenantId(record.getTenantId()); |
|
|
bill.setOwe(bill.getReceivePay()); |
|
|
|
|
|
bill.setNeedPay(bill.getNeedPay()); |
|
|
bill.setNeedPay(bill.getNeedPay()); |
|
|
bill.setUpdatetime(date); |
|
|
bill.setUpdatetime(date); |
|
|
bill.setRentShopType(record.getRentShopType()); |
|
|
bill.setRentShopType(record.getRentShopType()); |
|
|
@@ -657,6 +657,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
bill.setStatus(EnumBillRentStatus.PAID.getCode()); |
|
|
bill.setStatus(EnumBillRentStatus.PAID.getCode()); |
|
|
bill.setPayDate(date); |
|
|
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++; |
|
|
count++; |
|
|
} |
|
|
} |
|
|
wxBillRentMapper.insertBills(record.getPreviewBillRentList()); |
|
|
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); |
|
|
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.setServiceChargePay(servicePay.intValue()); |
|
|
|
|
|
wxBillRent.setOwe(wxBillRent.getReceivePay() + wxBillRent.getServiceChargePay()); |
|
|
resultList.add(wxBillRent); |
|
|
resultList.add(wxBillRent); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|