From 7ef83f0708e9d04c2536d7d0ad453073d42f680d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 25 十月 2024 11:27:27 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 7 +++
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java | 8 ++++
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java | 3 +
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java | 31 +++++++++------
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java | 22 ++++++----
5 files changed, 48 insertions(+), 23 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java
index b6cd84b..3e5d867 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java
@@ -80,6 +80,14 @@
@ApiModelProperty(value = "总费用")
@TableField("order_amount")
private BigDecimal orderAmount;
+
+ @ApiModelProperty(value = "支付金额")
+ @TableField("payment")
+ private BigDecimal payment;
+
+ @ApiModelProperty(value = "支付方式")
+ @TableField("payType")
+ private String payType;
@ApiModelProperty(value = "状态（1=已进场，2=已出场，3=已缴费出场）")
@TableField("status")
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
index 0f54b24..e90a7ce 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
@@ -224,21 +224,26 @@
.eq(TChargingPile::getCode, code).eq(TChargingPile::getDelFlag, 0));
if(null != chargingPile){
if(chargingPile.getStatus() == 1){
- TFaultMessage faultMessage = new TFaultMessage();
- faultMessage.setSiteId(chargingPile.getSiteId());
- faultMessage.setChargingPileId(chargingPile.getId());
- faultMessage.setStatus(1);
- faultMessage.setDownTime(LocalDateTime.now());
- faultMessage.setCreateTime(LocalDateTime.now());
- faultMessage.setDelFlag(false);
- faultMessage.setContent("设备离线");
- faultMessageService.save(faultMessage);
-
- chargingPile.setStatus(0 == status ? 1 : 3);
- chargingPileService.updateById(chargingPile);
+ TFaultMessage faultMessage = faultMessageService.getOne(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingPileId, chargingPile.getId())
+ .eq(TFaultMessage::getStatus, 2).eq(TFaultMessage::getDelFlag, 0).isNull(TFaultMessage::getEndTime));
+ if(null == faultMessage){
+ faultMessage = new TFaultMessage();
+ faultMessage.setSiteId(chargingPile.getSiteId());
+ faultMessage.setChargingPileId(chargingPile.getId());
+ faultMessage.setStatus(2);
+ faultMessage.setDownTime(LocalDateTime.now());
+ faultMessage.setCreateTime(LocalDateTime.now());
+ faultMessage.setDelFlag(false);
+ faultMessage.setContent("设备故障");
+ faultMessageService.save(faultMessage);
+
+ chargingPile.setStatus(0 == status ? 1 : 3);
+ chargingPileService.updateById(chargingPile);
+ }
}
if(chargingPile.getStatus() != 1 && 0 == status){
- TFaultMessage one = faultMessageService.getOne(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingPileId, chargingPile.getId()).isNull(TFaultMessage::getEndTime));
+ TFaultMessage one = faultMessageService.getOne(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingPileId, chargingPile.getId())
+ .isNull(TFaultMessage::getEndTime));
if(null != one){
one.setEndTime(LocalDateTime.now());
faultMessageService.updateById(one);
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
index 5a8e7ee..437fb00 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
@@ -590,15 +590,19 @@
if(datas.size() > 0){
for (TChargingPile data : datas) {
if(data.getStatus() == 1){
- TFaultMessage faultMessage = new TFaultMessage();
- faultMessage.setSiteId(data.getSiteId());
- faultMessage.setChargingPileId(data.getId());
- faultMessage.setStatus(1);
- faultMessage.setDownTime(LocalDateTime.now());
- faultMessage.setCreateTime(LocalDateTime.now());
- faultMessage.setDelFlag(false);
- faultMessage.setContent("设备离线");
- faultMessageService.save(faultMessage);
+ TFaultMessage faultMessage = faultMessageService.getOne(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingPileId, data.getId())
+ .eq(TFaultMessage::getStatus, 1).eq(TFaultMessage::getDelFlag, 0).isNull(TFaultMessage::getEndTime));
+ if(null == faultMessage){
+ faultMessage = new TFaultMessage();
+ faultMessage.setSiteId(data.getSiteId());
+ faultMessage.setChargingPileId(data.getId());
+ faultMessage.setStatus(1);
+ faultMessage.setDownTime(LocalDateTime.now());
+ faultMessage.setCreateTime(LocalDateTime.now());
+ faultMessage.setDelFlag(false);
+ faultMessage.setContent("设备离线");
+ faultMessageService.save(faultMessage);
+ }
}
}
this.updateBatchById(datas);
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java
index bdefd57..f3ece3c 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java
@@ -72,6 +72,8 @@
parkingRecord.setOutParkingTime(LocalDateTime.parse(order.getLeaveDateTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
parkingRecord.setParkingDuration(Integer.valueOf(order.getLongTime()));
parkingRecord.setOrderAmount(new BigDecimal(order.getReceivable()));
+ parkingRecord.setPayment(new BigDecimal(order.getPayment()));
+ parkingRecord.setPayType(order.getPayType());
BigDecimal payment = new BigDecimal(order.getPayment());
parkingRecord.setStatus(BigDecimal.ZERO.compareTo(payment) == 0 ? 2 : 3);
parkingRecordClient.updateParkingRecord(parkingRecord);
@@ -120,6 +122,7 @@
parkingRecord.setOutParkingTime(LocalDateTime.parse(order.getLeavetime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
parkingRecord.setParkingDuration(Integer.valueOf(order.getLongTime()));
parkingRecord.setOrderAmount(new BigDecimal(order.getMoney()));
+ parkingRecord.setPayment(new BigDecimal(order.getMoney()));
parkingRecordClient.updateParkingRecord(parkingRecord);
}
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 92be7ad..adc90fe 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
@@ -792,6 +792,9 @@
one.setRefundStatus(2);
one.setRefundTime(LocalDateTime.now());
chargingOrderRefundService.updateById(one);
+ TChargingOrder chargingOrder = this.getById(one.getChargingOrderId());
+ chargingOrder.setPayTime(LocalDateTime.now());
+ this.updateById(chargingOrder);
return AjaxResult.success();
}
@@ -1930,7 +1933,7 @@
chargingOrderRefund.setRefundTitle("充电完成退款");
chargingOrderRefund.setRefundContent("充电完成退款");
chargingOrderRefund.setRefundReason("充电完成退款");
- chargingOrderRefund.setRefundRemark("充电完成退款");
+ chargingOrderRefund.setRefundRemark("实际充电消费金额：" + refundAmount);
chargingOrderRefund.setRefundTotalAmount(refundAmount);
chargingOrderRefund.setPayAmount(rechargeAmount);
if(1 == rechargePaymentType){
@@ -1960,6 +1963,8 @@
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-DDTHH:mm:ss+TIMEZONE");
AjaxResult success = chargingOrderStartupFailureWxRefund(resp.getOutTradeNo(), resp.getTradeNo(), "SUCCESS", sdf1.format(new Date()));
if(success.isSuccess()){
+ chargingOrder.setPayTime(LocalDateTime.now());
+ this.updateById(chargingOrder);
chargingOrderRefundService.save(chargingOrderRefund);
}
}
--
Gitblit v1.7.1