|
@@ -816,10 +816,8 @@ public class HlwPaymentServiceImpl extends ServiceImpl<HlwPaymentMapper, HlwPaym
|
|
|
hlwCpAccountFlow1.setType(1);
|
|
hlwCpAccountFlow1.setType(1);
|
|
|
hlwCpAccountFlow1.setAmount(hlwPayment.getPayment());
|
|
hlwCpAccountFlow1.setAmount(hlwPayment.getPayment());
|
|
|
hlwCpAccountFlow1.setServiceRate(hlwCpSubcontractor.getServiceRate());
|
|
hlwCpAccountFlow1.setServiceRate(hlwCpSubcontractor.getServiceRate());
|
|
|
- //平台总金额 = 项目金额*(1+平台服务费率),四舍五入
|
|
|
|
|
- Double totalPayment = businessAccountUtils.round(businessAccountUtils.mul(hlwPayment.getPayment(), businessAccountUtils.add(1, hlwCpSubcontractor.getServiceRate() / 100)), 2);
|
|
|
|
|
//平台-服务商的服务费(==arrivalServiceFee)
|
|
//平台-服务商的服务费(==arrivalServiceFee)
|
|
|
- Double serviceFee = businessAccountUtils.sub(totalPayment, hlwPayment.getPayment());
|
|
|
|
|
|
|
+ Double serviceFee = hlwPayment.getArrivalServiceFee();
|
|
|
hlwCpAccountFlow1.setServiceFee(serviceFee);
|
|
hlwCpAccountFlow1.setServiceFee(serviceFee);
|
|
|
hlwCpAccountFlowService.save(hlwCpAccountFlow1);
|
|
hlwCpAccountFlowService.save(hlwCpAccountFlow1);
|
|
|
//服务商账户明细表-进账(插入)
|
|
//服务商账户明细表-进账(插入)
|
|
@@ -1189,7 +1187,7 @@ public class HlwPaymentServiceImpl extends ServiceImpl<HlwPaymentMapper, HlwPaym
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public List<HlwPayment> findListByCompanyIdAndSunId(Integer companyId, Integer subcontractorId) {
|
|
public List<HlwPayment> findListByCompanyIdAndSunId(Integer companyId, Integer subcontractorId) {
|
|
|
- return baseMapper.findListByCompanyIdAndSunId(companyId,subcontractorId);
|
|
|
|
|
|
|
+ return baseMapper.findListByCompanyIdAndSunId(companyId, subcontractorId);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|