From 2b62f01a38f0ac9b0c8df8cb2e539fd0f582dcf9 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Wed, 3 Apr 2024 10:56:06 +0800
Subject: [PATCH] =?UTF-8?q?update=20=20=E5=8D=8E=E4=B8=BAService?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jsowell/service/OrderService.java |  2 +-
 .../pile/dto/ThirdPartyCommonStartChargeDTO.java    |  1 +
 .../jsowell/thirdparty/huawei/HuaweiServiceV2.java  | 13 +++++++------
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
index 70c05867e..e846e16e2 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
@@ -1350,7 +1350,7 @@ public class OrderService {
                 dto.setStationIds(Lists.newArrayList(stationId));
                 dto.setPileConnectorCode(orderInfo.getPileConnectorCode());
                 dto.setThirdPartyType(thirdPartyType);
-
+                dto.setOrderCode(orderCode);
                 String result = commonService.commonQueryStartCharge(dto);
                 log.info("异步判断是否对接第三方平台 stationId:{}, thirdPartyType:{}, result:{}", stationId, thirdPartyType, result);
             }
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/ThirdPartyCommonStartChargeDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/ThirdPartyCommonStartChargeDTO.java
index 9af6ad923..b00cc9070 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/ThirdPartyCommonStartChargeDTO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/ThirdPartyCommonStartChargeDTO.java
@@ -13,6 +13,7 @@ import java.util.List;
  */
 @Data
 public class ThirdPartyCommonStartChargeDTO {
+    private String orderCode;
     /**
      * 第三方平台类型
      */
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/HuaweiServiceV2.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/HuaweiServiceV2.java
index b99c6e023..78510d651 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/HuaweiServiceV2.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/HuaweiServiceV2.java
@@ -520,11 +520,11 @@ public class HuaweiServiceV2 {
         String requestName = "query_start_charge";
 
         // 生成订单
-        String orderCode = IdUtils.getOrderCode();
-        String startChargeSeq = Constants.OPERATORID_JIANG_SU + "_C" + orderCode;
+        String orderCode = dto.getStartChargeSeq();
+        // String startChargeSeq = orderCode;
         QueryStartChargeDTO startChargeDTO = new QueryStartChargeDTO();
         startChargeDTO.setOperatorId(ThirdPartyOperatorIdEnum.HUA_WEI.getOperatorId());
-        startChargeDTO.setStartChargeSeq(startChargeSeq);
+        startChargeDTO.setStartChargeSeq(orderCode);
         startChargeDTO.setConnectorID(pileConnectorCode);
         startChargeDTO.setAccountBalance(chargeAmount);
         startChargeDTO.setPayMode(dto.getPayMode());
@@ -536,7 +536,7 @@ public class HuaweiServiceV2 {
         }
         // 拼装参数
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("StartChargeSeq", startChargeSeq);
+        jsonObject.put("StartChargeSeq", orderCode);
         jsonObject.put("ConnectorID", pileConnectorCode);
         jsonObject.put("MoneyLimit", chargeAmount);
 
@@ -968,6 +968,7 @@ public class HuaweiServiceV2 {
         chargeDTO.setConnectorID(pileConnectorCode);
         chargeDTO.setMoneyLimit(chargeAmount);
         chargeDTO.setPayMode(payMode);
+        chargeDTO.setStartChargeSeq(dto.getOrderCode());
         QueryStartChargeVO startChargeVO = queryStartCharge(chargeDTO);
         if (startChargeVO.getSuccStat() != Constants.zero) {
             log.error(label + "请求启动充电 error, {}", startChargeVO.getFailReason());
@@ -977,8 +978,8 @@ public class HuaweiServiceV2 {
         // Threads.sleep(5000);
         // query_equip_charge_status  查询设备充电状态
         QueryChargeStatusVO chargeStatusVO = new QueryChargeStatusVO();
-        for (int i = 1; i <= 3; i ++) {
-            // 循环 3 次，每次延时5s，查询充电状态
+        for (int i = 1; i <= 10; i ++) {
+            // 循环 10 次，每次延时5s，查询充电状态
             Threads.sleep(5000);
             chargeStatusVO = queryChargeStatus(startChargeSeq);
             if (chargeStatusVO != null) {