From 727bd67e564a447ced5d42e11e87315bd6ee5db4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 25 十月 2024 09:45:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index ac294ce..7785418 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -92,7 +92,8 @@
private TokenService tokenService;
@Autowired
private TOrderEvaluateService orderEvaluateService;
-
+ @Autowired
+ private TGrantVipService tGrantVipService;
@Resource
private WxPaymentClient wxPaymentClient;
@@ -133,6 +134,15 @@
@Resource
private TOrderInvoiceService invoiceService;
+ /**
+ * 远程调用 增加管理后台赠送会员记录
+ * @return
+ */
+ @ResponseBody
+ @PostMapping(value = "/management/give/vip")
+ public R managementGiveVip(@RequestBody TGrantVip grantVip) {
+ return R.ok(tGrantVipService.save(grantVip));
+ }
/**
* 远程调用根据枪id 查询最新的订单id 用户后台结束充电
@@ -790,16 +800,22 @@
List<UploadRealTimeMonitoringData> data1 = uploadRealTimeMonitoringDataClient.getAll(mongoChargingOrderQuery).getData();
List<ChargingOrderAndUploadRealTimeMonitoringDataDto> dtos = new ArrayList<>();
+ Map<String,ChargingOrderVO> map = new HashMap<>();
for (UploadRealTimeMonitoringData uploadRealTimeMonitoringData : data1) {
ChargingOrderAndUploadRealTimeMonitoringDataDto dataDto = new ChargingOrderAndUploadRealTimeMonitoringDataDto();
BeanUtils.copyProperties(uploadRealTimeMonitoringData,dataDto);
ChargingOrderQuery dto = new ChargingOrderQuery();
+ dto.setCode(uploadRealTimeMonitoringData.getTransaction_serial_number());
TCharingOrderVO vo = chargingOrderService.chargingOrder(dto);
- ChargingOrderVO chargingOrderVO = vo.getList().getRecords().get(0);
- if (chargingOrderVO!=null) {
- BeanUtils.copyProperties(chargingOrderVO, dataDto);
+ if (!vo.getList().getRecords().isEmpty()) {
+ ChargingOrderVO chargingOrderVO = vo.getList().getRecords().get(0);
+ if (chargingOrderVO != null) {
+ BeanUtils.copyProperties(chargingOrderVO, dataDto);
+ }
+ dtos.add(dataDto);
+ }else {
+ continue;
}
- dtos.add(dataDto);
}
--
Gitblit v1.7.1