From 2ce4235f583c1a43a4dcc5118cd59d6f6a11e507 Mon Sep 17 00:00:00 2001
From: "YAS\\29473" <2947326429@qq.com>
Date: Tue, 5 Aug 2025 10:30:29 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=B8=B8=E7=95=85=E5=85=85=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E5=85=85=E7=94=B5=E8=AE=B0=E5=BD=95=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3,=E5=8F=AA=E9=9C=80=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E4=BB=96=E4=BB=AC=E5=B9=B3=E5=8F=B0=E5=90=AF=E5=8A=A8=E7=9A=84?=
 =?UTF-8?q?=E5=85=85=E7=94=B5=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ChangZhouPlatformServiceImpl.java    | 37 +++++++++++++++++++
 .../util/ThirdPartyPlatformUtils.java         | 13 +++++++
 2 files changed, 50 insertions(+)

diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ChangZhouPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ChangZhouPlatformServiceImpl.java
index 295efb174..6db725c00 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ChangZhouPlatformServiceImpl.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ChangZhouPlatformServiceImpl.java
@@ -59,6 +59,8 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 
+import static com.jsowell.thirdparty.platform.util.ThirdPartyPlatformUtils.isNeedPushToThirdPartyPlatform;
+
 @Service
 @Slf4j
 public class ChangZhouPlatformServiceImpl implements ThirdPartyPlatformService {
@@ -469,6 +471,13 @@ public class ChangZhouPlatformServiceImpl implements ThirdPartyPlatformService {
      */
     @Override
     public String notificationStartChargeResult(String orderCode) {
+        //判断是否是常畅充平台的订单
+        Boolean flag = isNeedPushToThirdPartyPlatform(orderCode , ThirdPlatformTypeEnum.CHANG_ZHOU_PLATFORM.getOperatorId());
+        if (!flag){
+            //表示不是常畅充平台的订单
+            return null;
+        }
+
         // 根据订单号查询订单信息
         OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
         if (orderInfo == null) {
@@ -582,6 +591,13 @@ public class ChangZhouPlatformServiceImpl implements ThirdPartyPlatformService {
      */
     @Override
     public String notificationEquipChargeStatus(String orderCode) {
+        //判断是否是常畅充平台的订单
+        Boolean flag = isNeedPushToThirdPartyPlatform(orderCode , ThirdPlatformTypeEnum.CHANG_ZHOU_PLATFORM.getOperatorId());
+        if (!flag){
+            //表示不是常畅充平台的订单
+            return null;
+        }
+
         // 根据订单号查询订单信息
         OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
         OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderInfo.getOrderCode());
@@ -684,6 +700,13 @@ public class ChangZhouPlatformServiceImpl implements ThirdPartyPlatformService {
      */
     @Override
     public String notificationStopChargeResult(String orderCode) {
+        //判断是否是常畅充平台的订单
+        Boolean flag = isNeedPushToThirdPartyPlatform(orderCode , ThirdPlatformTypeEnum.CHANG_ZHOU_PLATFORM.getOperatorId());
+        if (!flag){
+            //表示不是常畅充平台的订单
+            return null;
+        }
+
         // 根据订单号查询订单信息
         OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
         if (orderInfo == null) {
@@ -752,6 +775,13 @@ public class ChangZhouPlatformServiceImpl implements ThirdPartyPlatformService {
      */
     @Override
     public String notificationChargeOrderInfo(String orderCode, ThirdPartySecretInfoVO thirdPartySecretInfoVO) {
+        //判断是否是常畅充平台的订单
+        Boolean flag = isNeedPushToThirdPartyPlatform(orderCode , ThirdPlatformTypeEnum.CHANG_ZHOU_PLATFORM.getOperatorId());
+        if (!flag){
+            //表示不是常畅充平台的订单
+            return null;
+        }
+
         OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
         OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderCode);
 
@@ -808,6 +838,13 @@ public class ChangZhouPlatformServiceImpl implements ThirdPartyPlatformService {
      */
     @Override
     public String notificationPayOrderInfo(String orderCode){
+        //判断是否是常畅充平台的订单
+        Boolean flag = isNeedPushToThirdPartyPlatform(orderCode , ThirdPlatformTypeEnum.CHANG_ZHOU_PLATFORM.getOperatorId());
+        if (!flag){
+            //表示不是常畅充平台的订单
+            return null;
+        }
+
         //获取订单信息
         OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
         if (orderBasicInfo == null) {
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/util/ThirdPartyPlatformUtils.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/util/ThirdPartyPlatformUtils.java
index aa40616ef..846d84498 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/util/ThirdPartyPlatformUtils.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/util/ThirdPartyPlatformUtils.java
@@ -116,4 +116,17 @@ public class ThirdPartyPlatformUtils {
         }
     }
 
+    /**
+     * 通过截取订单号前9位,来判断是否需要推送充电记录到指定的第三方平台
+     * 例: 2025-08-05 ,常畅充平台只需要通过他们平台启动的充电记录
+     *
+     *
+     * @param orderCode
+     * @return
+     */
+    public static Boolean isNeedPushToThirdPartyPlatform(String orderCode,String operatorId) {
+        String operatorIdPrefix = StringUtils.substring(orderCode , 0 , 9);
+        return operatorIdPrefix.equals(operatorId);
+    }
+
 }