From d1d7df6417a76d481e654c96b2db34e4fbab88ea Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 31 十月 2024 15:53:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 86 +++++++++++++++++++++++++++++++++----------
1 files changed, 66 insertions(+), 20 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 d7ccc05..e3ab58d 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:
@@ -348,7 +351,6 @@
public AjaxResult<ChargingOrderInfoVO> chargingOrderInfo(String strategyId) {
TChargingOrder byId = chargingOrderService.getById(strategyId);
ChargingOrderInfoVO chargingOrderInfoVO = new ChargingOrderInfoVO();
-
chargingOrderInfoVO.setCdElectronic(byId.getCurrent()!=null?byId.getCurrent().setScale(2, BigDecimal.ROUND_HALF_DOWN)+"":"");
chargingOrderInfoVO.setCdVoltage(byId.getVoltage()!=null?byId.getVoltage().setScale(2, BigDecimal.ROUND_HALF_DOWN)+"":"");
chargingOrderInfoVO.setSurplus(byId.getTotalElectricity()!=null?byId.getTotalElectricity().setScale(2, BigDecimal.ROUND_HALF_DOWN)+"":"");
@@ -367,14 +369,14 @@
List<TChargingOrderAccountingStrategy> list = chargingOrderAccountingStrategyService.lambdaQuery().eq(TChargingOrderAccountingStrategy::getChargingOrderId, strategyId).orderByDesc(TChargingOrderAccountingStrategy::getStartTime).list();
for (TChargingOrderAccountingStrategy tChargingOrderAccountingStrategy : list) {
- if (byId.getVipDiscountAmount()!=null){
+ if (byId.getVipDiscountAmount()!=null && byId.getServiceCharge().compareTo(BigDecimal.ZERO) != 0){
BigDecimal multiply = byId.getVipDiscountAmount().divide(byId.getServiceCharge(), 2)
.multiply(tChargingOrderAccountingStrategy.getPeriodOriginalServicePrice());
tChargingOrderAccountingStrategy.setVipDiscount(multiply);
}
bigDecimal = bigDecimal.add(tChargingOrderAccountingStrategy.getPeriodOriginalServicePrice());
- if (byId.getCouponDiscountAmount()!=null){
+ if (byId.getCouponDiscountAmount()!=null && byId.getServiceCharge().compareTo(BigDecimal.ZERO) != 0){
BigDecimal multiply = byId.getCouponDiscountAmount().divide(byId.getServiceCharge(), 2)
.multiply(tChargingOrderAccountingStrategy.getPeriodOriginalServicePrice());
tChargingOrderAccountingStrategy.setCouponDiscount(multiply);
@@ -511,7 +513,7 @@
@PostMapping(value = "/chargingOrderWXCallback")
public void chargingOrderWXCallback(@RequestParam("out_trade_no") String out_trade_no, @RequestParam("transaction_id") String transaction_id,
@RequestParam("attach") String attach) {
- AjaxResult ajaxResult = chargingOrderService.chargingOrderCallback(1, out_trade_no, transaction_id, attach);
+ chargingOrderService.chargingOrderCallback(1, out_trade_no, transaction_id, attach);
}
@@ -776,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);
@@ -795,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<>();
@@ -803,19 +809,29 @@
ChargingOrderAndUploadRealTimeMonitoringDataDto dataDto = new ChargingOrderAndUploadRealTimeMonitoringDataDto();
ChargingOrderQuery dto = new ChargingOrderQuery();
dto.setCode(uploadRealTimeMonitoringData.getTransaction_serial_number());
- TCharingOrderVO vo = chargingOrderService.chargingOrder(dto);
- if (!vo.getList().getRecords().isEmpty()) {
- ChargingOrderVO chargingOrderVO = vo.getList().getRecords().get(0);
- if (chargingOrderVO != null) {
- BeanUtils.copyProperties(chargingOrderVO, dataDto);
+
+ if (map.get(uploadRealTimeMonitoringData.getTransaction_serial_number())==null) {
+ TCharingOrderVO vo = chargingOrderService.chargingOrder(dto);
+ map.put(uploadRealTimeMonitoringData.getTransaction_serial_number(),vo.getList().getRecords().get(0));
+ if (!vo.getList().getRecords().isEmpty()) {
+ ChargingOrderVO chargingOrderVO = vo.getList().getRecords().get(0);
+ if (chargingOrderVO != null) {
+ BeanUtils.copyProperties(chargingOrderVO, dataDto);
+ }
+ BeanUtils.copyProperties(uploadRealTimeMonitoringData, dataDto);
+ dataDto.setStartTime(uploadRealTimeMonitoringData.getStartTime());
+ dataDto.setEndTime(uploadRealTimeMonitoringData.getEndTime() == null ? null : uploadRealTimeMonitoringData.getEndTime());
+ dataDto.setStatus(uploadRealTimeMonitoringData.getStatus());
+ dtos.add(dataDto);
}
- BeanUtils.copyProperties(uploadRealTimeMonitoringData,dataDto);
+ }else {
+ ChargingOrderVO vo = map.get(uploadRealTimeMonitoringData.getTransaction_serial_number());
+ BeanUtils.copyProperties(vo, dataDto);
+ BeanUtils.copyProperties(uploadRealTimeMonitoringData, dataDto);
dataDto.setStartTime(uploadRealTimeMonitoringData.getStartTime());
- dataDto.setEndTime(uploadRealTimeMonitoringData.getEndTime()==null?null:uploadRealTimeMonitoringData.getEndTime());
+ dataDto.setEndTime(uploadRealTimeMonitoringData.getEndTime() == null ? null : uploadRealTimeMonitoringData.getEndTime());
dataDto.setStatus(uploadRealTimeMonitoringData.getStatus());
dtos.add(dataDto);
- }else {
- continue;
}
}
for (int i = 0; i < dtos.size(); i++) {
@@ -823,14 +839,21 @@
}
PageChargingOrderAndUploadRealTimeMonitoringDataDto page = new PageChargingOrderAndUploadRealTimeMonitoringDataDto();
- page.setCount(data1.getCount());
+ page.setTotal(data1.getCount());
page.setRecords(dtos);
return R.ok(page);
}
-
-
-
+
+
+
+ @ResponseBody
+ @GetMapping(value = "/watch/deletes")
+ @ApiOperation(value = "监控订单-删除", tags = {"管理后台-订单管理"})
+ public R watchChargingOrder(@RequestParam String id) {
+ uploadRealTimeMonitoringDataClient.delete(id);
+ return R.ok();
+ }
/**
* 处理充电订单实时监控数据相关的业务逻辑
@@ -1239,8 +1262,19 @@
//车辆用途
List<Map<String, Object>> carMap = chargingOrderService.carUserMethod();
+
//车辆品牌
List<Map<String, Object>> carBrandMap = chargingOrderService.carUserBrand();
+ List<String> brands = new ArrayList<>();
+ for (Map<String, Object> objectMap : carBrandMap) {
+ brands.add(objectMap.get("vehicle_brand").toString());
+ }
+
+ Long count = chargingOrderService.countCar(brands);
+ Map<String, Object> others = new HashMap<>();
+ others.put("vehicle_brand","其他");
+ others.put("counts",count);
+ carBrandMap.add(others);
//本地车数量
Map<String,Object> localCarMap = chargingOrderService.countLocalCar();
@@ -1303,7 +1337,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();
@@ -1663,7 +1697,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);
}
@@ -1767,4 +1801,16 @@
EndOfChargePageInfo endOfChargePageInfo = chargingOrderService.getEndOfChargePageInfo(id);
return AjaxResult.success(endOfChargePageInfo);
}
+
+
+ /**
+ * 获取订单数据
+ * @param order
+ * @return
+ */
+ @PostMapping("/getChargingOrder")
+ public R<List<TChargingOrder>> getChargingOrder(@RequestBody TChargingOrderVo order){
+ List<TChargingOrder> chargingOrder = chargingOrderService.getChargingOrder(order);
+ return R.ok(chargingOrder);
+ }
}
--
Gitblit v1.7.1