From 8db69750cbd6b63be7ca41b03bb47cdeaef98f51 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Wed, 23 Aug 2023 09:30:57 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E5=88=86=E8=B4=A6?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsowell/api/uniapp/TempController.java    | 28 +++++++++++++++++++
 .../pile/service/IOrderBasicInfoService.java  |  4 ++-
 .../impl/OrderBasicInfoServiceImpl.java       |  1 +
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java
index bd2481945..6d749debc 100644
--- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java
@@ -210,6 +210,34 @@ public class TempController extends BaseController {
         return response;
     }
 
+    /**
+     * 临时 余额支付分账
+     * http://localhost:8080/temp/doBalancePaymentTemp
+     * @param dto
+     * @return
+     */
+    @PostMapping("/doBalancePaymentTemp")
+    public RestApiResponse<?> doBalancePaymentTemp(@RequestBody QueryOrderDTO dto) {
+        RestApiResponse<?> response = null;
+        try {
+            OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(dto.getOrderCode());
+            if (orderBasicInfo == null) {
+                throw new BusinessException(ReturnCodeEnum.CODE_QUERY_ORDER_INFO_IS_NULL);
+            }
+            String merchantId = orderBasicInfo.getMerchantId();
+            AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId);
+            if (adapayMemberAccount == null) {
+                throw new BusinessException("", "查询信息为空");
+            }
+            String appId = pileMerchantInfoService.queryAppIdByMerchantId(merchantId);
+            orderBasicInfoService.doBalancePayment(orderBasicInfo, adapayMemberAccount, appId);
+        } catch (Exception e) {
+            logger.error("临时接口交易确认接口 error,", e);
+            response = new RestApiResponse<>(ReturnCodeEnum.CODE_WEIXIN_REFUND_ERROR);
+        }
+        return response;
+    }
+
     /**
      * 运营商分账手动接口
      * http://localhost:8080/temp/orderSplittingOperations
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java
index 8ec0b9cda..213c66dcc 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java
@@ -153,7 +153,9 @@ public interface IOrderBasicInfoService {
 
 	void tempOrderSplittingOperations(String merchantId, String tradeDate);
 
-    List<BalanceDeductionAmountVO> calculateTheBalanceDeductionAmount(String memberId, BigDecimal amount);
+	OrderSettleResult doBalancePayment(OrderBasicInfo orderBasicInfo, AdapayMemberAccount adapayMemberAccount, String wechatAppId) throws BaseAdaPayException;
+
+	List<BalanceDeductionAmountVO> calculateTheBalanceDeductionAmount(String memberId, BigDecimal amount);
 
     /**
 	 * 执行订单分账
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 f815da3a0..69daa54cb 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
@@ -1150,6 +1150,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
      * @param adapayMemberAccount
      * @return
      */
+    @Override
     public OrderSettleResult doBalancePayment(OrderBasicInfo orderBasicInfo, AdapayMemberAccount adapayMemberAccount, String wechatAppId) throws BaseAdaPayException {
         BigDecimal settleAmount = orderBasicInfo.getSettleAmount();
         String orderCode = orderBasicInfo.getOrderCode();