Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStartChargeDTO.java

@@ -3,6 +3,8 @@ package com.jsowell.pile.dto;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * 请求启动充电DTO
  *
@@ -43,4 +45,10 @@ public class QueryStartChargeDTO {
 
     @JsonProperty(value = "OperatorID")
     private String operatorId;
+
+    /**
+     * 可充电金额
+     */
+    @JsonProperty(value = "AccountBalance")
+    private BigDecimal accountBalance;
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java

@@ -2485,7 +2485,13 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
         String connectorCode = StringUtils.substring(pileConnectorCode, 14, 16);
 
         String transactionCode = IdUtils.generateTransactionCode(pileSn, connectorCode);
+        // 校验充电桩信息
+        GenerateOrderDTO generateOrderDTO = new GenerateOrderDTO();
+        generateOrderDTO.setPileSn(pileSn);
+        generateOrderDTO.setConnectorCode(connectorCode);
+        generateOrderDTO.setStartMode(StartModeEnum.THIRD_PARTY_PLATFORM.getValue());
 
+        checkPileInfo(generateOrderDTO);
         // 通过桩号查询所属站点
         PileBasicInfo pileBasicInfo = pileBasicInfoService.selectPileBasicInfoBySN(pileSn);
         Long stationId = pileBasicInfo.getStationId();
@@ -2504,9 +2510,9 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
                 .connectorCode(connectorCode)
                 .pileConnectorCode(pileConnectorCode)
                 // .logicCard(pileAuthCardInfo.getLogicCard())  // 卡号
-                .startMode(StartModeEnum.LIAN_LIAN.getValue())
+                .startMode(StartModeEnum.THIRD_PARTY_PLATFORM.getValue())
                 .payStatus(Constants.ONE)
-                .payAmount(new BigDecimal("500"))  // 支付金额 2023.05.31：联联平台不会传金额，所以先给500，默认是直到充满
+                .payAmount(dto.getAccountBalance())  // 支付金额
                 .payTime(new Date())
                 // .payMode(PayModeEnum.PAYMENT_OF_BALANCE.getValue())  // 支付方式
                 .orderAmount(BigDecimal.ZERO)