From d96060da9a4695ad57ff87dfa78b47420732b545 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Thu, 19 Dec 2024 16:47:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=88=86=E8=B4=A6=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E6=B5=8B=E8=AF=95=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/test/java/PaymentTestController.java   | 18 ++++++++++++++++++
 .../pile/service/OrderBasicInfoService.java    |  2 ++
 .../impl/OrderBasicInfoServiceImpl.java        |  4 +++-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/jsowell-admin/src/test/java/PaymentTestController.java b/jsowell-admin/src/test/java/PaymentTestController.java
index 73eba5cae..c9db0ebf0 100644
--- a/jsowell-admin/src/test/java/PaymentTestController.java
+++ b/jsowell-admin/src/test/java/PaymentTestController.java
@@ -16,9 +16,11 @@ import com.jsowell.adapay.response.PaymentConfirmResponse;
 import com.jsowell.adapay.response.PaymentReverseResponse;
 import com.jsowell.adapay.response.QueryPaymentConfirmDetailResponse;
 import com.jsowell.adapay.service.AdapayService;
+import com.jsowell.adapay.vo.OrderSplitResult;
 import com.jsowell.common.enums.ykc.ScenarioEnum;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.pile.domain.AdapayMemberAccount;
+import com.jsowell.pile.service.OrderBasicInfoService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -53,6 +55,9 @@ public class PaymentTestController {
     @Autowired
     private AdapayService adapayService;
 
+    @Autowired
+    private OrderBasicInfoService orderBasicInfoService;
+
     public List<String> getPaymentIdList() {
         List<String> resultList = Lists.newArrayList();
         // List<String> paymentIdList1 = getPaymentIdList1();
@@ -468,4 +473,17 @@ public class PaymentTestController {
         String wechatAppId = wechatAppId1; // 万车充id
         adapayService.createBalancePaymentRequest(outMemberId, inMemberId, transAmt, title, desc, wechatAppId);
     }
+
+    /**
+     * 校验订单分账金额
+     */
+    @Test
+    public void verifyOrderConfirmAmountTest() throws BaseAdaPayException {
+        String orderCode = "C21960272918";
+        List<String> paymentIds = Lists.newArrayList("002212024121307453510713429549121368064");
+        BigDecimal settleAmount = new BigDecimal("19.37");
+        String wechatAppId = wechatAppId1;
+        OrderSplitResult orderSplitResult = orderBasicInfoService.verifyOrderConfirmAmount(paymentIds, orderCode, settleAmount, wechatAppId);
+        System.out.println(JSON.toJSONString(orderSplitResult));
+    }
 }
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java
index 5d73cee5d..5b199ecfe 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java
@@ -203,6 +203,8 @@ public interface OrderBasicInfoService{
 
     OrderSplitResult doBalancePaymentWithDelay(OrderBasicInfo orderBasicInfo, AdapayMemberAccount adapayMemberAccount, String wechatAppId) throws BaseAdaPayException;
 
+    OrderSplitResult verifyOrderConfirmAmount(List<String> paymentIds, String orderCode, BigDecimal settleAmount, String wechatAppId) throws BaseAdaPayException;
+
     /**
      * 批量查询订单
      * @param orderCodeList
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 ba8ef5ca9..07ec9b97d 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
@@ -1469,6 +1469,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
      * @param orderBasicInfo      订单
      * @param adapayMemberAccount 结算账户
      */
+    @Override
     public OrderSplitResult doPaymentConfirmWithDelay(OrderBasicInfo orderBasicInfo, AdapayMemberAccount adapayMemberAccount, String wechatAppId) throws BaseAdaPayException {
         // 订单编号
         String orderCode = orderBasicInfo.getOrderCode();
@@ -1569,7 +1570,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
      * @param orderCode    订单编号
      * @param settleAmount 结算金额
      */
-    private OrderSplitResult verifyOrderConfirmAmount(List<String> paymentIds, String orderCode, BigDecimal settleAmount, String wechatAppId) throws BaseAdaPayException {
+    @Override
+    public OrderSplitResult verifyOrderConfirmAmount(List<String> paymentIds, String orderCode, BigDecimal settleAmount, String wechatAppId) throws BaseAdaPayException {
         // 分账金额
         BigDecimal totalConfirmAmt = BigDecimal.ZERO;
         // 手续费