From c1b93ee0513818705021705b7a16a3eb10eb33ea Mon Sep 17 00:00:00 2001
From: Hawking <hhawking@qq.com>
Date: Sat, 22 Apr 2023 20:33:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E5=8D=95=E6=97=A0=E6=B3=95=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=AE=8C=E5=8D=95=E5=88=86=E8=B4=A6=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ghy/order/service/impl/OrderDetailServiceImpl.java    | 2 +-
 .../com/ghy/order/service/impl/OrderMasterServiceImpl.java    | 1 +
 .../java/com/ghy/quartz/service/impl/OrderServiceImpl.java    | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
index 9979c682..b0c7ce24 100644
--- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
+++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
@@ -537,7 +537,7 @@ public class OrderDetailServiceImpl implements OrderDetailService {
                     fee.add(payMoney).toString(), divMembers, null, null);
             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);
 
diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
index f5f4fd02..defb3e48 100644
--- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
+++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
@@ -234,6 +234,7 @@ public class OrderMasterServiceImpl implements OrderMasterService {
             }
         }
         memberMap.put(AdapayUtils.getWorkerMemberId(orderMaster.getWorkerId(), orderMaster.getDeptId()), bigWorkerAmt);
+        confirmAmt = confirmAmt.add(bigWorkerAmt);
 
         // 分账账户
         ArrayList<DivMember> divMembers = new ArrayList<>();
diff --git a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
index 4254f1c8..0a418b24 100644
--- a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
+++ b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
@@ -182,13 +182,13 @@ public class OrderServiceImpl implements OrderService {
                 boolean allAssign = orderMasterService.isAllAssign(om.getId());
                 // 如果存在未派单的子订单 就不刷新主单状态
                 if (!allAssign) {
-                    break;
+                    continue;
                 }
                 List<OrderDetail> ods = orderDetailService.selectByOrderMasterId(om.getId());
                 Set<Integer> statusSet = ods.stream().map(OrderDetail::getOrderStatus).collect(Collectors.toSet());
                 // 没有子单,未派单的情况不刷新主单状态
                 if (CollectionUtils.isEmpty(statusSet)) {
-                    break;
+                    continue;
                 }
                 boolean allFinish = true;
                 for (Integer integer : statusSet) {