From bb0206811551df4f62ff4d996b2bd54af2b960ee Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Mon, 6 Jan 2025 12:14:22 +0800
Subject: [PATCH] update

---
 .../api/uniapp/customer/TempController.java     | 17 +++++++++++++++++
 .../com/jsowell/mq/OrderRabbitListener.java     |  1 +
 .../service/impl/OrderBasicInfoServiceImpl.java |  7 ++++---
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java
index e4f4d116a..a4272634c 100644
--- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java
@@ -666,4 +666,21 @@ public class TempController extends BaseController {
         }
         return response;
     }
+
+    /**
+     * 手动接口, 执行新的分账方法
+     * https://localhost:8080/temp/realTimeOrderSplit
+     */
+    @PostMapping("/realTimeOrderSplit")
+    public RestApiResponse<?> splitTheBillForOrderTemp(@RequestBody AfterSettleOrderDTO afterSettleOrderDTO) {
+        RestApiResponse<?> response;
+        try {
+            orderBasicInfoService.realTimeOrderSplit(afterSettleOrderDTO);
+            response = new RestApiResponse<>();
+        } catch (Exception e) {
+            logger.error("手动接口, 执行新的分账方法error", e);
+            response = new RestApiResponse<>("00200005", "手动分账接口失败");
+        }
+        return response;
+    }
 }
diff --git a/jsowell-pile/src/main/java/com/jsowell/mq/OrderRabbitListener.java b/jsowell-pile/src/main/java/com/jsowell/mq/OrderRabbitListener.java
index 791136059..84ea04166 100644
--- a/jsowell-pile/src/main/java/com/jsowell/mq/OrderRabbitListener.java
+++ b/jsowell-pile/src/main/java/com/jsowell/mq/OrderRabbitListener.java
@@ -33,6 +33,7 @@ public class OrderRabbitListener {
         log.info("接收到订单结算数据：{}", afterSettleOrderDTO);
         List<String> newLogicStationIdList = YKCUtils.getNewLogicStationIdList();
         if (newLogicStationIdList.contains(afterSettleOrderDTO.getStationId())) {
+            log.info("接收到订单结算数据：{}", afterSettleOrderDTO);
             try {
                 orderBasicInfoService.realTimeOrderSplit(afterSettleOrderDTO);
             } catch (BaseAdaPayException e) {
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
index 0f57829f3..9780fe13b 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
@@ -1665,7 +1665,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
         BigDecimal orderConsumeAmount = afterSettleOrderDTO.getOrderConsumeAmount(); // 消费金额
         BigDecimal orderRefundAmount = afterSettleOrderDTO.getOrderRefundAmount(); // 退款金额
         if (orderConsumeAmount.add(orderRefundAmount).compareTo(orderPayAmount) != 0) {
-            logger.info("订单支付金额与消费金额+退款金额不相等");
+            logger.info("realTimeOrderSplit-订单:{}, 支付金额与消费金额+退款金额不相等", afterSettleOrderDTO.getOrderCode());
             return null;
         }
 
@@ -1720,7 +1720,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
         BigDecimal orderSettleAmount = afterSettleOrderDTO.getOrderSettleAmount() == null ? BigDecimal.ZERO : afterSettleOrderDTO.getOrderSettleAmount();
         // 订单是否需要分账, 结算金额必须大于0
         if (orderSettleAmount.compareTo(BigDecimal.ZERO) <= 0) {
-            logger.info("订单结算金额必须大于0");
+            logger.info("realTimeOrderSplit-订单结算金额必须大于0");
             return null;
         }
         // 校验分账
@@ -1731,9 +1731,10 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
         List<SplitData> splitDataList = calculationSplitDataList(stationSplitConfigList, afterSettleOrderDTO);
         List<DivMember> divMemberList = transformDivMemberList(splitDataList);
         // List<DivMember> divMemberList = calculationOfSplitAmount(stationSplitConfigList, afterSettleOrderDTO);
+        logger.info("realTimeOrderSplit-订单:{}, 分账信息:{}", afterSettleOrderDTO.getOrderCode(), JSON.toJSONString(splitDataList));
         // 执行分账
         if (CollectionUtils.isEmpty(divMemberList)) {
-            logger.info("分账信息为空");
+            logger.info("realTimeOrderSplit-分账信息为空");
             return null;
         }
         String orderCode = afterSettleOrderDTO.getOrderCode();