clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

增加子单金额的分账

This commit is contained in:
cb 2025-06-08 18:13:17 +08:00
parent 18b6d5325d
commit 9a722c8da2
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
View File

@ -621,8 +621,20 @@ public class OrderDetailServiceImpl implements OrderDetailService {
// 子单的实际金额 // 子单的实际金额
BigDecimal odMoney = financialDetail.getPayMoney().subtract(changeMoney); BigDecimal odMoney = financialDetail.getPayMoney().subtract(changeMoney);
logger.info("子单的实际金额{}", odMoney); logger.info("子单的实际金额{}", odMoney);
if (MoneyUtil.lte0(odMoney)) { if (MoneyUtil.lte0(odMoney)) {
ArrayList<DivMember> divMembers = new ArrayList<>();
logger.info("子财务单[{}] 应支付金额={} 不需要分账", financialDetail.getId(), odMoney); logger.info("子财务单[{}] 应支付金额={} 不需要分账", financialDetail.getId(), odMoney);
divMembers.add(new DivMember("0", MoneyUtil.toS(payMoney), false));
String orderNo = "OD_" + orderDetailId + "_" + System.currentTimeMillis();
logger.info("子订单[{}]发起分账: {} 分账人员{}", orderDetailId, JSON.toJSONString(divMembers), orderDetail.getWorkerName());
JSONObject response = adapayService.paymentConfirm(deptId, orderPayment.getId(), orderNo, MoneyUtil.toS(payMoney), divMembers, null, null);
logger.info("子订单[{}]的分账结果: {}", orderDetailId, response.toString());
boolean status = AdapayStatusEnum.succeeded.code.equals(response.getString("status"));
// 如果确认支付失败 这里抛出异常 回滚订单状态
Assert.isTrue(status, response.toString());
// 分账成功 把罚金状态改为已扣除
} else { } else {
// 查询师傅的超时扣款记录 // 查询师傅的超时扣款记录
List<OrderTimeoutRecord> fineRecords = orderFineRecordMapper.selectUnFine(orderDetail.getWorkerId(), orderMaster.getDeptId()); List<OrderTimeoutRecord> fineRecords = orderFineRecordMapper.selectUnFine(orderDetail.getWorkerId(), orderMaster.getDeptId());
@ -679,7 +691,7 @@ public class OrderDetailServiceImpl implements OrderDetailService {
financialDetail1.setPayTime(new Date()); financialDetail1.setPayTime(new Date());
financialDetail1.setFinancialMasterId(financialMasterId); financialDetail1.setFinancialMasterId(financialMasterId);
int financialDetailInsert= financialDetailService.insertFinancialDetail(financialDetail1); int financialDetailInsert= financialDetailService.insertFinancialDetail(financialDetail1);
logger.info("平台的抽成减去承担手续费后的金额{}，平台手续费{},子单金额{},是否更新成功{},是否增加成功{}", payMoney, commissionAmount,odMoney,financialDetailUpdate,financialDetailInsert); logger.info("平台的抽成减去承担手续费后的金额{}，平台手续费{},子单金额{},是否更新成功{},是否增加成功{}", payMoney, commissionAmount,odMoney,financialDetailUpdate,financialDetailInsert);
} }
logger.info("子单的罚金处理后的总额{}", dtx); logger.info("子单的罚金处理后的总额{}", dtx);