From d1d45ed6b39eb7d0cc7c51a94ae9c8079f91abcd Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Thu, 17 Apr 2025 14:12:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E6=9C=AA=E5=88=86=E5=B8=90=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/common/constant/CacheConstants.java |  5 +++++
 .../java/com/jsowell/quartz/task/JsowellTask.java   | 13 +++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java b/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java
index 3d3719f45..6ee645c0d 100644
--- a/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java
+++ b/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java
@@ -407,4 +407,9 @@ public class CacheConstants {
 
 	public static final String DELAYED_PAYMENT_CONFIRM_QUEUE = "delayed_payment_confirm_queue:";
 	public static final String FAILED_PAYMENT_CONFIRM_LIST = "failed_payment_confirm_list:";
+
+	/**
+	 * 控制处理未分帐订单频率
+	 */
+	public static final String PROCESS_UNSPLIT_ORDERS = "processUnsplitOrders";
 }
diff --git a/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java b/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java
index 1e62088d6..87c15bd1f 100644
--- a/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java
+++ b/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java
@@ -351,12 +351,9 @@ public class JsowellTask {
     public void processUnSettledOrder() {
         String startTime = "2023-01-01 00:00:00";
         String endTime = "2023-12-31 23:59:59";
-        String adapayMemberId = "0";
-        String wechatAppId1 = "wxbb3e0d474569481d"; // 万车充
 
         // 使用redis控制请求api
-        String key = "processUnsplitOrders";
-        Boolean setnx = redisCache.setnx(key, "1", 65);
+        Boolean setnx = redisCache.setnx(CacheConstants.PROCESS_UNSPLIT_ORDERS, Constants.ONE, 65);
         if (!setnx) {
             return;
         }
@@ -373,7 +370,7 @@ public class JsowellTask {
             BigDecimal confirmAmt = orderUnsplitRecord.getSettleAmount();
 
             DivMember divMember = new DivMember();
-            divMember.setMemberId(adapayMemberId);
+            divMember.setMemberId(Constants.ZERO); // 若是商户本身时，传入0
             divMember.setAmount(AdapayUtil.formatAmount(confirmAmt));
             divMember.setFeeFlag(Constants.Y);
 
@@ -382,7 +379,7 @@ public class JsowellTask {
                     .divMemberList(Lists.newArrayList(divMember))
                     .confirmAmt(confirmAmt)
                     .orderCode(orderCode)
-                    .wechatAppId(wechatAppId1)
+                    .wechatAppId(Constants.DEFAULT_APP_ID) // 默认使用万车充的appId
                     .build();
             // 延时分账，使用确认交易API
             PaymentConfirmResponse paymentConfirmResponse = adapayService.createPaymentConfirmRequest(param);
@@ -396,8 +393,8 @@ public class JsowellTask {
             } else {
                 // error_type:api_error, error_code:confirm_amt_over_limit, error_msg当前确认金额 > 支付金额 - 已支付确认金额 - 已支付撤销金额
                 if (paymentConfirmResponse.getError_code().equals("confirm_amt_over_limit")) {
-                    // TODO 查询paymentId的总分账金额
-                    BigDecimal totalSplitAmount = BigDecimal.ZERO;
+                    // 查询paymentId的总分账金额
+                    BigDecimal totalSplitAmount;
                     try {
                         totalSplitAmount = adapayService.getTotalSplitAmountByPaymentId(paymentId);
                     } catch (BaseAdaPayException e) {