bugfix 修复电池充电报告发送信息缺少参数

jsowell-admin/src/main/resources/application-dev.yml

@@ -263,6 +263,7 @@ batteryChargeReport:
   getTaskIdApi: /api/docking/api/evaluate
   apiPrefix: /api/docking/report/
   token: MTc0NzcyMjgwMzg0NC1xNmFucG96cHR4aQ==
+  mfrID: mfr8944567890598756
 
 # dubbo配置
 dubbo:

jsowell-admin/src/main/resources/application-prd.yml

@@ -258,6 +258,7 @@ batteryChargeReport:
   getTaskIdApi: /api/docking/api/evaluate
   apiPrefix: /api/docking/report/
   token: MTc0NzcyMjgwMzg0NC1xNmFucG96cHR4aQ==
+  mfrID: mfr8944567890598756
 
 # dubbo配置
 dubbo:

jsowell-admin/src/main/resources/application-pre.yml

@@ -281,6 +281,7 @@ batteryChargeReport:
   getTaskIdApi: /api/docking/api/evaluate
   apiPrefix: /api/docking/report/
   token: MTc0NzcyMjgwMzg0NC1xNmFucG96cHR4aQ==
+  mfrID: mfr8944567890598756
 
 # dubbo配置
 dubbo:

jsowell-admin/src/main/resources/application-sit.yml

@@ -256,6 +256,7 @@ batteryChargeReport:
   getTaskIdApi: /api/docking/api/evaluate
   apiPrefix: /api/docking/report/
   token: MTc0NzcyMjgwMzg0NC1xNmFucG96cHR4aQ==
+  mfrID: mfr8944567890598756
 
 # dubbo配置
 dubbo:

jsowell-admin/src/main/resources/application.yml

@@ -157,6 +157,7 @@ batteryChargeReport:
   getTaskIdApi: /api/docking/api/evaluate
   apiPrefix: /api/docking/report/
   token: MTc0NzcyMjgwMzg0NC1xNmFucG96cHR4aQ==
+  mfrID: mfr8944567890598756
 
 # sms4j
 sms:

jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/OrderVO.java

@@ -76,7 +76,7 @@ public class OrderVO {
     /**
      * 结算时间
      */
-    private String settlemetTime;
+    private String settlementTime;
 
     /**
      * 结算金额（指实际产生的消费，包括本金支付，微信支付等）
@@ -156,4 +156,6 @@ public class OrderVO {
      * 会员id
      */
     private String memberId;
+
+    private String phoneNumber;
 }

jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml

@@ -3245,9 +3245,10 @@
     </select>
 
     <select id="getChargeOrderInfoByOrderCode" resultType="com.jsowell.pile.vo.uniapp.customer.OrderVO">
-        SELECT t1.merchant_id              as mercahntId,
+        SELECT t1.merchant_id              as merchantId,
                t3.organization_code        as organizationCode,
                t1.order_code               AS orderCode,
+               t4.mobile_number as phoneNumber,
                t1.transaction_code         AS transactionCode,
                t1.order_status             AS orderStatus,
                t1.station_id               AS stationId,
@@ -3259,9 +3260,9 @@
                t1.pay_amount               AS payAmount,
                t1.pay_time                 AS payTime,
                t1.order_amount             AS orderAmount,
-               t1.plate_number             AS plateNumber,
+               t1.plate_number             AS licensePlateNumber,
                t1.discount_amount          AS discountAmount,
-               t1.settlement_time          as settlemetTime,
+               t1.settlement_time          as settlementTime,
                t1.settle_amount            AS settleAmount,
                t1.create_time              as createTime,
                t1.charge_start_time        AS startTime,
@@ -3277,6 +3278,8 @@
              order_detail t2 ON t1.order_code = t2.order_code
                  join
              pile_merchant_info t3 on t1.merchant_id = t3.id
+            join
+            member_basic_info t4 on t1.member_id = t4.id
         WHERE t1.del_flag = '0'
           AND t1.order_code = #{orderCode,jdbcType=VARCHAR}
     </select>

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/BatteryChargeReportService.java

@@ -53,6 +53,9 @@ public class BatteryChargeReportService {
     @Value("${batteryChargeReport.token}")
     private String token;
 
+    @Value("${batteryChargeReport.mfrID}")
+    private String mfrID;
+
     @Autowired
     private RedisCache redisCache;
 
@@ -211,7 +214,7 @@ public class BatteryChargeReportService {
                 .collect(Collectors.toSet());
 
         BatteryChargeReportData data = BatteryChargeReportData.builder()
-                .mfrID("")
+                .mfrID(mfrID)
                 .siteName(stationVO.getStationName())
                 .siteAddress(stationVO.getAddress())
                 .siteLongitude(stationVO.getStationLng())
@@ -221,7 +224,7 @@ public class BatteryChargeReportService {
                 .businessStatus(Constants.ZERO) // 营业状态 0-正常; 1-停运
                 .sitePileNumber(snList.size()) // 桩数量
                 .siteGunNumber(pileConnectorInfoVOS.size())
-                .phone("") // 用户手机号码
+                .phone(orderVO.getPhoneNumber()) // 用户手机号码
                 .siteCode(stationVO.getId())
                 .pileCode(orderVO.getPileSn())
                 .gunNo(orderVO.getConnectorCode())