From 1266ed302b259f09a9370bc4315316b8a212b5d0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 26 一月 2025 11:42:35 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index c10feaf..461958a 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -4019,12 +4019,12 @@
/**
* 添加三方平台充电订单数据
- * @param chargingGunId
+ * @param query
*/
@Override
- public R addTripartitePlatformOrder(Integer chargingGunId, String operatorId, Integer rechargePaymentType, BigDecimal paymentAmount, String startChargeSeq) {
+ public R addTripartitePlatformOrder(AddTripartitePlatformOrder query) {
//检查当前枪是否是正在使用中
- TChargingOrder one = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getChargingGunId, chargingGunId)
+ TChargingOrder one = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getChargingGunId, query.getChargingGunId())
.in(TChargingOrder::getStatus, Arrays.asList(1, 2, 3)).eq(TChargingOrder::getDelFlag, 0));
if(null != one){
return R.fail("充电枪正在充电中，启动失败");
@@ -4037,21 +4037,30 @@
chargingOrder.setCode(code);
chargingOrder.setOrderType(1);
chargingOrder.setOrderClassification(1);
- TChargingGun tChargingGun = chargingGunClient.getChargingGunById(chargingGunId).getData();
+ TChargingGun tChargingGun = chargingGunClient.getChargingGunById(query.getChargingGunId()).getData();
TChargingPile chargingPile = chargingPileClient.getChargingPileById(tChargingGun.getChargingPileId()).getData();
chargingOrder.setSiteId(tChargingGun.getSiteId());
chargingOrder.setChargingPileId(tChargingGun.getChargingPileId());
- chargingOrder.setChargingGunId(chargingGunId);
- chargingOrder.setRechargePaymentType(rechargePaymentType);
+ chargingOrder.setChargingGunId(query.getChargingGunId());
+ chargingOrder.setRechargePaymentType(query.getRechargePaymentType());
chargingOrder.setRechargePaymentStatus(2);
- chargingOrder.setRechargeAmount(paymentAmount);
+ chargingOrder.setRechargeAmount(query.getPaymentAmount());
chargingOrder.setVipDiscountAmount(BigDecimal.ZERO);
chargingOrder.setOrderSource(2);
- Operator operator = operatorClient.getOperator(operatorId).getData();
+ Operator operator = operatorClient.getOperator(query.getOperatorId()).getData();
chargingOrder.setOperatorId(operator.getId());
chargingOrder.setAppUserId(operator.getId().longValue());
chargingOrder.setTripartitePlatformName(operator.getName());
- chargingOrder.setStartChargeSeq(startChargeSeq);
+ chargingOrder.setStartChargeSeq(query.getStartChargeSeq());
+ //车辆信息
+ if(StringUtils.hasLength(query.getPlateNum())){
+ TAppUserCar appUserCar = appUserCarClient.getAppUserCarByLicensePlate(query.getPlateNum()).getData();
+ if(null != appUserCar){
+ chargingOrder.setAppUserCarId(appUserCar.getId());
+ }
+ }
+
+
chargingOrder.setTitle("【充电桩充电】" + chargingPile.getNumber() + "号桩/" + tChargingGun.getCode() + "号枪");
chargingOrder.setStatus(2);
chargingOrder.setPayTime(LocalDateTime.now());
--
Gitblit v1.7.1