From 63eaf1f93d535e166115ddcef0274a0331fe96f0 Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 10 Jan 2024 10:53:14 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=96=B0=E7=94=B5=E9=80=94=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E5=90=AF=E5=8A=A8=E5=85=85=E7=94=B5=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsowell/pile/dto/QueryStartChargeDTO.java | 8 ++++++++ .../com/jsowell/pile/mapper/OrderBasicInfoMapper.java | 2 ++ .../pile/service/impl/OrderBasicInfoServiceImpl.java | 5 +++++ .../thirdparty/xindiantu/service/impl/XDTServiceImpl.java | 2 +- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStartChargeDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStartChargeDTO.java index 838384da9..b1841aa45 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStartChargeDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStartChargeDTO.java @@ -60,5 +60,13 @@ public class QueryStartChargeDTO { // ----------------- 新电途平台接口拓展字段------------------ + /** + * 预充金额，电量充到该金额自动停止。单位(元) + */ private BigDecimal chargingAmt; + + /** + * 司机在合作公司的唯一标识(手机号)，方便维护订单信息 + */ + private String driverId; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java index 048876f54..1a02becc0 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java @@ -13,10 +13,12 @@ import com.jsowell.pile.vo.uniapp.PersonPileConnectorSumInfoVO; import com.jsowell.pile.vo.uniapp.SendMessageVO; import com.jsowell.pile.vo.web.*; import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; import java.time.LocalDateTime; import java.util.List; +@Repository public interface OrderBasicInfoMapper { /** * delete by primary key diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 076bd293e..2857423d4 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -2481,6 +2481,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { String connectorCode = StringUtils.substring(pileConnectorCode, 14, 16); String transactionCode = IdUtils.generateTransactionCode(pileSn, connectorCode); + // 校验充电桩信息 GenerateOrderDTO generateOrderDTO = new GenerateOrderDTO(); generateOrderDTO.setPileSn(pileSn); @@ -2513,6 +2514,10 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { // .payMode(PayModeEnum.PAYMENT_OF_BALANCE.getValue()) // 支付方式 .orderAmount(BigDecimal.ZERO) .build(); + if (StringUtils.isNotBlank(dto.getPlateNum())) { + // 车牌号 + orderBasicInfo.setPlateNumber(dto.getPlateNum()); + } // 根据桩编码查询当前计费模板 BillingTemplateVO billingTemplateVO = pileBillingTemplateService.selectBillingTemplateDetailByPileSn(pileSn); // 订单详情 diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/xindiantu/service/impl/XDTServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/xindiantu/service/impl/XDTServiceImpl.java index f69fcd13b..9ea93913b 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/xindiantu/service/impl/XDTServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/xindiantu/service/impl/XDTServiceImpl.java @@ -108,7 +108,7 @@ public class XDTServiceImpl implements XDTService { */ @Override public Map queryStartCharge(QueryStartChargeDTO dto) { - dto.setAccountBalance(dto.getChargingAmt()); + dto.setAccountBalance(dto.getChargingAmt()); // 新电途扩展字段，充电金额字段为 chargingAmt return zdlService.queryStartCharge(dto); }