From 267e4e523fb4d71e8acae7f6c26f5bcc8b76a410 Mon Sep 17 00:00:00 2001
From: "YAS\\29473" <2947326429@qq.com>
Date: Fri, 23 May 2025 18:48:38 +0800
Subject: [PATCH] update

---
 .../jsowell/thirdparty/common/NotificationService.java    | 8 --------
 .../lianlian/service/impl/LianLianServiceImpl.java        | 1 +
 .../service/impl/LianLianPlatformServiceImpl.java         | 7 +++----
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/NotificationService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/NotificationService.java
index b0f52b4f6..8565f55fb 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/NotificationService.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/NotificationService.java
@@ -169,14 +169,6 @@ public class NotificationService {
                 ThirdPartyPlatformService platformService = ThirdPartyPlatformFactory.getInvokeStrategy(secretInfoVO.getPlatformType());
                 //充电订单信息推送
                 platformService.notificationChargeOrderInfo(orderCode, secretInfoVO);
-                // 测试联联之禾时发现会同时有两条notification_orderInfo请求发送,原因是异步走了lianLianService中的方法,因此请求一条出错,一条成功
-                // 注释掉另一个异步方法中的判断联联的if判断,看看效果
-                if(secretInfoVO.getPlatformType().equals(ThirdPlatformTypeEnum.LIAN_LIAN_PLATFORM.getTypeCode())){
-                    //订单信息推送
-                    platformService.notificationChargeOrderInfo(orderCode);
-                    //推送停止充电结果
-                    platformService.notificationStopChargeResult(orderCode);
-                }
             } catch (Exception e) {
                 logger.error("充电订单信息推送error", e);
             }
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java
index ad3a190c4..986376570 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java
@@ -878,6 +878,7 @@ public class LianLianServiceImpl implements LianLianService {
      */
     @Override
     public String pushOrderInfo(String orderCode) {
+        logger.info("LianLianServiceImpl pushOrderInfo start");
         List<ChargeDetail> chargeDetails = new ArrayList<>();
         // 根据订单号查询出信息
         OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java
index 27e582468..483f50a1f 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java
@@ -930,7 +930,7 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
      */
     @Override
     public String notificationChargeOrderInfo(String orderCode) {
-
+        log.info("LianLianPlatformServiceImpl.notificationChargeOrderInfo start");
         // 根据订单号查询出信息
         OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
         OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderCode);
@@ -963,7 +963,6 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
                 .startTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderBasicInfo.getChargeStartTime()))
                 .endTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderBasicInfo.getChargeEndTime()))
                 .paymentAmount(orderBasicInfo.getPayAmount())
-                .orderType(Constants.one)
                 // .payChannel()
                 .stopReason(0)
                 // .chargeDetails()
@@ -1001,7 +1000,7 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
         List<ChargeDetail> chargeDetails = new ArrayList<>();
         for (BillingPriceVO billingPriceVO : billingList) {
             detail = new ChargeDetail();
-            //改为YYYY-MM-DD HH:mm:ss格式
+          /*  //改为YYYY-MM-DD HH:mm:ss格式
             //拼接 开始时间和结束时间
             String startTime = billingPriceVO.getStartTime();
             String endTime = billingPriceVO.getEndTime();
@@ -1009,7 +1008,7 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
             billingPriceVO.setStartTime(DateUtils.formatTime(startTime));
             billingPriceVO.setEndTime(DateUtils.formatTime(endTime));
 
-            billingPriceVO.getStartTime();
+            billingPriceVO.getStartTime();*/
             if (StringUtils.equals(billingPriceVO.getTimeType(), "1")) {
                 // 尖时段
                 detail.setDetailStartTime(billingPriceVO.getStartTime());