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

主单无法自动完单分账的问题

This commit is contained in:
Hawking 2023-04-22 20:33:58 +08:00
parent 43aaede0b6
commit c1b93ee051
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -537,7 +537,7 @@ public class OrderDetailServiceImpl implements OrderDetailService {
fee.add(payMoney).toString(), divMembers, null, null); fee.add(payMoney).toString(), divMembers, null, null);
boolean status = AdapayStatusEnum.succeeded.code.equals(response.getString("status")); boolean status = AdapayStatusEnum.succeeded.code.equals(response.getString("status"));
// 如果确认支付失败 这里抛出异常 回滚订单状态 // 如果确认支付失败 这里抛出异常 回滚订单状态
Assert.isTrue(status, response.getString("error_msg")); Assert.isTrue(status, response.toString());
// 待提现金额里加入子财务单金额 // 待提现金额里加入子财务单金额
dtx = dtx.add(fdPayMoney); dtx = dtx.add(fdPayMoney);

1
ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
View File

@ -234,6 +234,7 @@ public class OrderMasterServiceImpl implements OrderMasterService {
} }
} }
memberMap.put(AdapayUtils.getWorkerMemberId(orderMaster.getWorkerId(), orderMaster.getDeptId()), bigWorkerAmt); memberMap.put(AdapayUtils.getWorkerMemberId(orderMaster.getWorkerId(), orderMaster.getDeptId()), bigWorkerAmt);
confirmAmt = confirmAmt.add(bigWorkerAmt);
// 分账账户 // 分账账户
ArrayList<DivMember> divMembers = new ArrayList<>(); ArrayList<DivMember> divMembers = new ArrayList<>();

4
ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
View File

@ -182,13 +182,13 @@ public class OrderServiceImpl implements OrderService {
boolean allAssign = orderMasterService.isAllAssign(om.getId()); boolean allAssign = orderMasterService.isAllAssign(om.getId());
// 如果存在未派单的子订单 就不刷新主单状态 // 如果存在未派单的子订单 就不刷新主单状态
if (!allAssign) { if (!allAssign) {
break; continue;
} }
List<OrderDetail> ods = orderDetailService.selectByOrderMasterId(om.getId()); List<OrderDetail> ods = orderDetailService.selectByOrderMasterId(om.getId());
Set<Integer> statusSet = ods.stream().map(OrderDetail::getOrderStatus).collect(Collectors.toSet()); Set<Integer> statusSet = ods.stream().map(OrderDetail::getOrderStatus).collect(Collectors.toSet());
// 没有子单,未派单的情况不刷新主单状态 // 没有子单,未派单的情况不刷新主单状态
if (CollectionUtils.isEmpty(statusSet)) { if (CollectionUtils.isEmpty(statusSet)) {
break; continue;
} }
boolean allFinish = true; boolean allFinish = true;
for (Integer integer : statusSet) { for (Integer integer : statusSet) {