From 7f56f4a48b64fc1b6806b41f1e80292a8a2d1dba Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Thu, 11 Jan 2024 14:26:02 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=94=AF=E4=BB=98=E6=88=90=E5=8A=9F=E6=9C=AA?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E8=AE=A2=E5=8D=95=EF=BC=8C=E6=8E=92=E9=99=A4?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E5=90=AF=E5=8A=A8=E7=9A=84=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../test/java/SpringBootTestController.java   | 22 +++++++++++--------
 .../thirdparty/ThirdPlatformTypeEnum.java     |  3 +--
 .../mapper/pile/OrderBasicInfoMapper.xml      |  1 +
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java
index 611b571f5..b209ac2f7 100644
--- a/jsowell-admin/src/test/java/SpringBootTestController.java
+++ b/jsowell-admin/src/test/java/SpringBootTestController.java
@@ -576,10 +576,17 @@ public class SpringBootTestController {
     public void queryPaymentConfirmListTest() {
         QueryPaymentConfirmDTO dto = new QueryPaymentConfirmDTO();
         dto.setWechatAppId(wechatAppId1);
-        // dto.setPaymentId("0022120230910032226990546664907296944128");
-        dto.setPaymentConfirmId("0022120231009032351990557174514064834560");
-        QueryPaymentConfirmDetailResponse.PaymentConfirmInfo paymentConfirmInfo = adapayService.queryPaymentConfirmDetail(dto);
-        System.out.println(JSON.toJSONString(paymentConfirmInfo));
+        dto.setPaymentId("002212023122208033310584061601344237568");
+        QueryPaymentConfirmDetailResponse response = adapayService.queryPaymentConfirmList(dto);
+        List<QueryPaymentConfirmDetailResponse.PaymentConfirmInfo> paymentConfirms = response.getPaymentConfirms();
+        // 如果没有分账信息，说明没有清分
+        String clearingStatus = null;
+        if (org.springframework.util.CollectionUtils.isEmpty(paymentConfirms)) {
+            clearingStatus = "未清分";
+        } else {
+            clearingStatus = "已清分";
+        }
+        System.out.println(clearingStatus);
     }
 
     @Test
@@ -688,10 +695,7 @@ public class SpringBootTestController {
     // 需要重新分账的订单信息（针对未分账的订单）
     public JSONArray getPaymentList() {
         String jsonArrayString = "[" +
-                "{\"orderCode\":\"C21350495809\", \"settleAmount\":\"12.75\", \"paymentId\":\"002212023102607502510563402189752061952\"}" +
-                "{\"orderCode\":\"C48300427818\", \"settleAmount\":\"14.99\", \"paymentId\":\"002212023102717582410563917580340862976\"}" +
-                "{\"orderCode\":\"C42052601299\", \"settleAmount\":\"5.91\", \"paymentId\":\"002212023102916284510564619797265641472\"}" +
-                "{\"orderCode\":\"C80224392857\", \"settleAmount\":\"29.91\", \"paymentId\":\"002212023103116134010565340774007672832\"}" +
+                "{\"orderCode\":\"C82585387230\", \"settleAmount\":\"20.10\", \"paymentId\":\"002212023122208033310584061601344237568\"}" +
                 "]";
         return JSONArray.parseArray(jsonArrayString);
     }
@@ -705,7 +709,7 @@ public class SpringBootTestController {
         // TODO 获取默认结算账户，如需分给对应商户就填写正确的汇付会员id
         // AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.getDefault();
         AdapayMemberAccount adapayMemberAccount = new AdapayMemberAccount();
-        adapayMemberAccount.setAdapayMemberId("ACM67738893");
+        adapayMemberAccount.setAdapayMemberId("ACM65835351");
         for (int i = 0; i < paymentList.size(); i++) {
             JSONObject jsonObject = (JSONObject) paymentList.get(i);
             BigDecimal confirmAmt = jsonObject.getBigDecimal("settleAmount"); // 确认金额就是结算金额
diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java
index 95549bc67..45eeb6844 100644
--- a/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java
+++ b/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java
@@ -1,6 +1,5 @@
 package com.jsowell.common.enums.thirdparty;
 
-import com.jsowell.common.enums.ykc.ChargingFailedReasonEnum;
 import com.jsowell.common.util.StringUtils;
 
 /**
@@ -14,7 +13,7 @@ public enum ThirdPlatformTypeEnum {
     ZHONG_DIAN_LIAN_PLATFORM("2", "中电联平台"),
     JIANG_SU_PLATFORM("3", "江苏省平台"),
     YONG_CHENG_BO_CHE("4", "甬城泊车平台"),
-    XIN_DIAN_TU("6", "新电途平台");
+    XIN_DIAN_TU("6", "新电途平台"),
     ;
 
     private String code;
diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
index 350278ce1..5e4628e0e 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
@@ -2331,6 +2331,7 @@
         <include refid="Base_Column_List" />
         from order_basic_info
         where del_flag = '0'
+        and start_mode != '4'
         <if test="startTime != null and startTime != ''">
             and create_time <![CDATA[ >= ]]> #{startTime,jdbcType=VARCHAR}
         </if>