新增字段

jsowell-pile/src/main/java/com/jsowell/pile/domain/PileStationInfo.java

@@ -38,6 +38,11 @@ public class PileStationInfo extends BaseEntity {
 
 	private String deptId;
 
+	/**
+	 * 停车场配置表id
+	 */
+	private String parkingId;
+
 	/**
 	 * 二维码前缀
 	 */

jsowell-pile/src/main/java/com/jsowell/pile/domain/ThirdpartyParkingConfig.java

@@ -0,0 +1,61 @@
+package com.jsowell.pile.domain;
+
+import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+/**
+ * TODO
+ *
+ * @Date 2023/8/24 16:50
+ * @author  Lemon 
+ */
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ThirdpartyParkingConfig {
+    private Integer id;
+
+    /**
+    * 停车场库名称
+    */
+    private String parkingName;
+
+    /**
+    * 停车场库appId
+    */
+    private String appId;
+
+    /**
+    * 停车场库secretKey
+    */
+    private String secretKey;
+
+    /**
+    * 停车场库商户id
+    */
+    private String parkingMerchantId;
+
+    /**
+    * 票券id
+    */
+    private String couponId;
+
+    private Date createTime;
+
+    private String createBy;
+
+    private Date updateTime;
+
+    private String updateBy;
+
+    /**
+    * 删除标识(0-正常;1-删除)
+    */
+    private String delFlag;
+}

jsowell-pile/src/main/java/com/jsowell/pile/mapper/ThirdpartyParkingConfigMapper.java

@@ -0,0 +1,53 @@
+package com.jsowell.pile.mapper;
+
+import com.jsowell.pile.domain.ThirdpartyParkingConfig;
+
+/**
+ * TODO
+ *
+ * @Date 2023/8/24 16:50
+ * @author  Lemon 
+ */
+public interface ThirdpartyParkingConfigMapper {
+    /**
+     * delete by primary key
+     * @param id primaryKey
+     * @return deleteCount
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * insert record to table
+     * @param record the record
+     * @return insert count
+     */
+    int insert(ThirdpartyParkingConfig record);
+
+    /**
+     * insert record to table selective
+     * @param record the record
+     * @return insert count
+     */
+    int insertSelective(ThirdpartyParkingConfig record);
+
+    /**
+     * select by primary key
+     * @param id primary key
+     * @return object by primary key
+     */
+    ThirdpartyParkingConfig selectByPrimaryKey(Integer id);
+
+    /**
+     * update record selective
+     * @param record the updated record
+     * @return update count
+     */
+    int updateByPrimaryKeySelective(ThirdpartyParkingConfig record);
+
+    /**
+     * update record
+     * @param record the updated record
+     * @return update count
+     */
+    int updateByPrimaryKey(ThirdpartyParkingConfig record);
+}

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

@@ -830,6 +830,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
 
         // 从redis中取出实时记录保存到表中
         realTimeMonitorDataRedis2DB(orderBasicInfo.getTransactionCode(), orderCode);
+
+        // TODO 如果该站点的停车场优惠券信息配置不为空，则需绑定一张优惠券
     }
 
     /**
@@ -3043,7 +3045,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
         // 查询站点信息
         PileStationInfo pileStationInfo = pileStationInfoService.selectPileStationInfoById(Long.valueOf(stationId));
         String merchantId = pileStationInfo != null ? String.valueOf(pileStationInfo.getMerchantId()) : "";
-
+        String plateNumber = dto.getPlateNumber() != null ? dto.getPlateNumber() : "";
         // 订单基本信息
         OrderBasicInfo orderBasicInfo = OrderBasicInfo.builder()
                 .orderCode(orderCode)
@@ -3059,6 +3061,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
                 .payStatus(Constants.ZERO)
                 .payAmount(dto.getChargeAmount())
                 .payMode(dto.getPayMode())
+                .plateNumber(plateNumber)
                 .orderAmount(BigDecimal.ZERO)
                 .virtualAmount(BigDecimal.ZERO)
                 .settleAmount(BigDecimal.ZERO)

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

@@ -466,6 +466,9 @@ public class PileConnectorInfoServiceImpl implements IPileConnectorInfoService {
             if (StringUtils.isNotBlank(orderCode)) {
                 OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
                 List<RealTimeMonitorData> chargingRealTimeDataList = orderBasicInfoService.getChargingRealTimeData(orderBasicInfo.getTransactionCode());
+                if (CollectionUtils.isEmpty(chargingRealTimeDataList)) {
+                    continue;
+                }
                 RealTimeMonitorData realTimeMonitorData = chargingRealTimeDataList.get(0);
                 BigDecimal outputVoltage = new BigDecimal(realTimeMonitorData.getOutputVoltage());
                 pileConnectorInfoVO.setVoltage(outputVoltage);