From 3f9289f39da5f3b47ab2f2cdd81e00130a264aef Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 31 十月 2024 09:39:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 ed45896..fbc1d7f 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
@@ -196,6 +196,7 @@
payOrderInfoDto.setPayAmount(byId.getPaymentAmount());
payOrderInfoDto.setPayTime(byId.getCreateTime());
payOrderInfoDto.setRefundAmount(byId.getRefundAmount());
+ payOrderInfoDto.setRechargeAmount(byId.getRechargeAmount());
return R.ok(payOrderInfoDto);
case 2:
TShoppingOrder byId1 = shoppingOrderService.getById(orderId);
@@ -207,6 +208,7 @@
payOrderInfoDto1.setPayAmount(byId1.getPaymentAmount());
payOrderInfoDto1.setPayTime(byId1.getCreateTime());
payOrderInfoDto1.setRefundAmount(byId1.getRefundAmount());
+ payOrderInfoDto1.setRechargeAmount(byId1.getPaymentAmount());
return R.ok(payOrderInfoDto1);
case 3:
TVipOrder byId2 = vipOrderService.getById(orderId);
@@ -218,6 +220,7 @@
payOrderInfoDto2.setPayAmount(byId2.getPaymentAmount());
payOrderInfoDto2.setPayTime(byId2.getCreateTime());
payOrderInfoDto2.setRefundAmount(byId2.getRefundAmount());
+ payOrderInfoDto2.setRechargeAmount(byId2.getPaymentAmount());
return R.ok(payOrderInfoDto2);
//todo luo 停车场订单
// case 4:
@@ -775,6 +778,9 @@
LocalDate sixBefore = PreviousSixMonths.get();
Map<String,Object> map = chargingOrderService.countAll(sixBefore);
BigDecimal data = parkingLotClient.getRecordAmount(sixBefore).getData();
+ if (map ==null){
+ map = new HashMap<String,Object>();
+ }
map.put("parkingAmount",data);
BigDecimal data1 = shoppingOrderService.getSumAmount(sixBefore);
map.put("shopAmount",data1);
@@ -794,7 +800,8 @@
public R watchChargingOrder(@RequestBody MongoChargingOrderQuery mongoChargingOrderQuery) {
mongoChargingOrderQuery.setPageSize(10);
- UploadRealTimeMonitoringPageData data1 = uploadRealTimeMonitoringDataClient.getAll(mongoChargingOrderQuery).getData();
+ R<UploadRealTimeMonitoringPageData> all = uploadRealTimeMonitoringDataClient.getAll(mongoChargingOrderQuery);
+ UploadRealTimeMonitoringPageData data1 = all.getData();
List<ChargingOrderAndUploadRealTimeMonitoringDataDto> dtos = new ArrayList<>();
Map<String,ChargingOrderVO> map = new HashMap<>();
@@ -1319,7 +1326,7 @@
@ApiOperation(value = "电站评价", tags = {"管理后台-数据分析-设备运维分析"})
public R<TCharingUserEquimentVO> equipment(@RequestBody ChargingStatisticsQueryDto statisticsQueryDto){
List<Integer> siteIds =new ArrayList<>();
- if (statisticsQueryDto.getSiteId()==null) {
+ if (statisticsQueryDto.getSiteId()==null||statisticsQueryDto.getSiteId()==0) {
Long userId = SecurityUtils.getUserId();
//获取当前登录的siteIds
List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
@@ -1679,7 +1686,7 @@
Long userId = tokenService.getLoginUserApplet().getUserId();
List<TChargingOrder> list = chargingOrderService.list(Wrappers.lambdaQuery(TChargingOrder.class)
.eq(TChargingOrder::getAppUserId, userId)
- .eq(TChargingOrder::getStatus, 3));
+ .in(TChargingOrder::getStatus, Arrays.asList(1,2,3,4)));
List<Integer> gunIds = list.stream().map(TChargingOrder::getChargingGunId).collect(Collectors.toList());
return R.ok(gunIds);
}
--
Gitblit v1.7.1