From 04afd5aa53e61c315eaf6effea6b3f217053d0cd Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Mon, 18 Mar 2024 09:25:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E7=AB=99=E7=82=B9=E5=85=B3=E7=B3=BB=E8=A1=A8=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=20=E5=90=AF=E5=8A=A8=E6=96=B9=E5=BC=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/ThirdPartyStationRelation.java     | 39 ++++---------------
 .../vo/base/ThirdPartyStationRelationVO.java  |  2 +
 .../pile/ThirdPartyStationRelationMapper.xml  | 10 ++++-
 .../thirdparty/common/CommonService.java      | 14 ++++++-
 .../thirdparty/huawei/HuaweiServiceV2.java    |  2 +
 .../service/impl/LianLianServiceImpl.java     |  3 +-
 6 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ThirdPartyStationRelation.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ThirdPartyStationRelation.java
index 15c6ab61d..003f6071f 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ThirdPartyStationRelation.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ThirdPartyStationRelation.java
@@ -2,6 +2,7 @@ package com.jsowell.pile.domain;
 
 import com.jsowell.common.annotation.Excel;
 import com.jsowell.common.core.domain.BaseEntity;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -11,6 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author jsowell
  * @date 2023-06-06
  */
+@Data
 public class ThirdPartyStationRelation extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -31,43 +33,16 @@ public class ThirdPartyStationRelation extends BaseEntity {
     @Excel(name = "三方配置类型")
     private String thirdPartyType;
 
+    /**
+     * 启动方式（1-我方启动）
+     */
+    private String startMode;
+
     /**
      * 删除标识
      */
     private String delFlag;
 
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setStationId(Long stationId) {
-        this.stationId = stationId;
-    }
-
-    public Long getStationId() {
-        return stationId;
-    }
-
-    public void setThirdPartyType(String thirdPartyType) {
-        this.thirdPartyType = thirdPartyType;
-    }
-
-    public String getThirdPartyType() {
-        return thirdPartyType;
-    }
-
-    public void setDelFlag(String delFlag) {
-        this.delFlag = delFlag;
-    }
-
-    public String getDelFlag() {
-        return delFlag;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.JSON_STYLE)
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/ThirdPartyStationRelationVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/ThirdPartyStationRelationVO.java
index b241ba341..3a1e85487 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/ThirdPartyStationRelationVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/ThirdPartyStationRelationVO.java
@@ -14,6 +14,8 @@ public class ThirdPartyStationRelationVO {
 
     private String thirdPartyType;
 
+    private String startMode;
+
     private String urlAddress;
     private String operatorId;
     private String operatorSecret;
diff --git a/jsowell-pile/src/main/resources/mapper/pile/ThirdPartyStationRelationMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/ThirdPartyStationRelationMapper.xml
index 87a41692d..7f8f67c79 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/ThirdPartyStationRelationMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/ThirdPartyStationRelationMapper.xml
@@ -8,6 +8,7 @@
         <result property="id"    column="id"    />
         <result property="stationId"    column="station_id"    />
         <result property="thirdPartyType"    column="third_party_type"    />
+        <result property="startMode"    column="start_mode"    />
         <result property="createTime"    column="create_time"    />
         <result property="createBy"    column="create_by"    />
         <result property="updateTime"    column="update_time"    />
@@ -16,11 +17,11 @@
     </resultMap>
 
     <sql id="selectThirdPartyStationRelationVo">
-        select id, station_id, third_party_type, create_time, create_by, update_time, update_by, del_flag from thirdparty_station_relation
+        select id, station_id, third_party_type, start_mode, create_time, create_by, update_time, update_by, del_flag from thirdparty_station_relation
     </sql>
 
     <sql id="Base_Column_List" >
-        id, station_id, third_party_type, create_time, create_by, update_time, update_by, del_flag
+        id, station_id, third_party_type, start_mode, create_time, create_by, update_time, update_by, del_flag
     </sql>
 
     <select id="selectThirdPartyStationRelationList" parameterType="com.jsowell.pile.domain.ThirdPartyStationRelation" resultMap="ThirdPartyStationRelationResult">
@@ -40,6 +41,7 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="stationId != null">station_id,</if>
             <if test="thirdPartyType != null">third_party_type,</if>
+            <if test="startMode != null">start_mode,</if>
             <if test="createTime != null">create_time,</if>
             <if test="createBy != null">create_by,</if>
             <if test="updateTime != null">update_time,</if>
@@ -49,6 +51,7 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="stationId != null">#{stationId},</if>
             <if test="thirdPartyType != null">#{thirdPartyType},</if>
+            <if test="startMode != null">#{startMode},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
@@ -62,6 +65,7 @@
         <trim prefix="SET" suffixOverrides=",">
             <if test="stationId != null">station_id = #{stationId},</if>
             <if test="thirdPartyType != null">third_party_type = #{thirdPartyType},</if>
+            <if test="startMode != null">start_mode = #{startMode},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
@@ -86,6 +90,7 @@
         select
             t1.station_id as stationId,
             t1.third_party_type as thirdPartyType,
+            t1.start_mode as startMode,
             t2.url_address as urlAddress,
             t2.operator_id as operatorId,
             t2.operator_secret as operatorSecret,
@@ -107,6 +112,7 @@
         select
         t1.station_id as stationId,
         t1.third_party_type as thirdPartyType,
+        t1.start_mode as startMode,
         t2.url_address as urlAddress,
         t2.operator_id as operatorId,
         t2.operator_secret as operatorSecret,
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java
index 273fbbd19..813392065 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java
@@ -104,9 +104,13 @@ public class CommonService {
      * @param dto
      */
     public void insertInfo2DataBase(PushStationInfoDTO dto) {
+        String thirdPartyType = dto.getThirdPartyType();
         ThirdPartyStationRelation relation = new ThirdPartyStationRelation();
         relation.setStationId(dto.getStationId());
-        relation.setThirdPartyType(dto.getThirdPartyType());
+        relation.setThirdPartyType(thirdPartyType);
+        if (StringUtils.equals(thirdPartyType, ThirdPlatformTypeEnum.HUA_WEI.getCode())) {
+            relation.setStartMode(Constants.ONE);
+        }
         ThirdPartyStationRelationVO vo = thirdPartyStationRelationService.selectRelationInfo(relation);
         if (vo != null) {
             return;
@@ -202,6 +206,10 @@ public class CommonService {
         String changedStatus = changeConnectorStatus(connectorStatus, realTimeMonitorData.getPutGunType());
         for (ThirdPartyStationRelationVO vo : list) {
             String thirdPartyType = vo.getThirdPartyType();
+            if (StringUtils.equals(Constants.TWO, vo.getStartMode())) {
+                // 如果是对接平台方启动，不需要传
+                continue;
+            }
             if (StringUtils.equals(ThirdPlatformTypeEnum.LIAN_LIAN_PLATFORM.getCode(), thirdPartyType)) {
                 // 联联
                 OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode);
@@ -309,6 +317,10 @@ public class CommonService {
         }
         for (ThirdPartyStationRelationVO relationVO : relationInfoList) {
             String thirdPartyType = relationVO.getThirdPartyType();
+            if (StringUtils.equals(Constants.TWO, relationVO.getStartMode())) {
+                // 如果是对接平台方启动，不需要传
+                continue;
+            }
             if (StringUtils.equals(ThirdPlatformTypeEnum.LIAN_LIAN_PLATFORM.getCode(), thirdPartyType)) {
                 // 联联平台
                 // 推送停止充电结果
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 b06baffa2..6e8d4a6ba 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
@@ -773,6 +773,8 @@ public class HuaweiServiceV2 {
                 .build();
         transactionService.doUpdateOrder(transactionDTO);
 
+        // TODO 订单退款
+
         // 构建返回参数
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("StartChargeSeq", startChargeSeq);
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 e71104b35..df1ac0f1d 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
@@ -387,8 +387,7 @@ public class LianLianServiceImpl implements LianLianService {
         String dataSecret = "E6gnWuz0QzBW75CR";  // SPBNJ1Z5EQNmpK08  VTAEKDPVN9CUS7WO   huawei: zd4NrLWJ38XCTaqP  E6gnWuz0QzBW75CR
         String dataSecretIV = "SXejaSUx5yud8UHm"; // peRoTcb2C7zqKeII  83UZFFRRZDYNF5CR  huawei: RJJecvNTJ48SGMG7  SXejaSUx5yud8UHm
         String signSecret = "sRjCDeokckFGpYpA";  // sRjCDeokckFGpYpA
-        String dataString = "GZlmSIZOVzT+Yvpc2PmvNnWXL8LvGl835nWGQwrKl7/Ao4jlvMsK7wV1VfJz7jsWIdRmgQd6ZrAQuoxD5NfGxjIDuic9McX6JyvxK/9GPYq4q+14ojuwUk1XNCK6Ae1a9cKP4b6\n" +
-                "39x2Crof6/fRfnSvXR+6IUDWAl8gIVMkbHIQUkqs58C1Ik7d1OAss4eBmgeSoUddUDQ2Qj3nmCFGBmg==";
+        String dataString = "o1tqVesDkPUXBNdUmE10Z7FWjAf/KFO3Iq4NWNCcFeq0h8wBcdWcZwojkdv2TNFpS0Qftv1HWDTdm+8Pjj0AIw==";
 
         // 解密data
         byte[] plainText = Cryptos.aesDecrypt(Encodes.decodeBase64(dataString), dataSecret.getBytes(), dataSecretIV.getBytes());