From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:51:32 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 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 2b5ca4e..3b12a92 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
@@ -144,6 +144,9 @@
private AppUserCarClient appUserCarClient;
@Resource
private TChargingOrderAccountingStrategyService chargingOrderAccountingStrategyService;
+
+ @Resource
+ private TOrderInvoiceService invoiceService;
/**
@@ -576,6 +579,17 @@
}
+ /**
+ * 停止充电返回账单后计算费用
+ * @param vo
+ */
+ @PostMapping("/endChargeBillingCharge")
+ public void endChargeBillingCharge(@RequestBody TransactionRecordMessageVO vo){
+ log.error("-------------------停止充电返回账单后计算费用及修改业务状态-------------------：" + vo);
+ chargingOrderService.endChargeBillingCharge(vo);
+ }
+
+
@ResponseBody
@@ -699,7 +713,10 @@
for (UploadRealTimeMonitoringData uploadRealTimeMonitoringData : data1) {
ChargingOrderAndUploadRealTimeMonitoringDataDto dataDto = new ChargingOrderAndUploadRealTimeMonitoringDataDto();
BeanUtils.copyProperties(uploadRealTimeMonitoringData,dataDto);
- BeanUtils.copyProperties(map.get(uploadRealTimeMonitoringData.getCharging_pile_code()),dataDto);
+ TChargingOrder tChargingOrder = map.get(uploadRealTimeMonitoringData.getCharging_pile_code());
+ if (tChargingOrder!=null) {
+ BeanUtils.copyProperties(tChargingOrder, dataDto);
+ }
dtos.add(dataDto);
}
@@ -1303,8 +1320,7 @@
}
- @Resource
- private TOrderInvoiceService invoiceService;
+
@ResponseBody
@GetMapping(value = "/work/shopOrder")
@ApiOperation(value = "购物订单统计", tags = {"管理后台-工作台"})
@@ -1337,16 +1353,20 @@
return R.ok(userMap);
}
- public static void main(String[] args) {
- // 示例数据
- List<TChargingOrder> list = getSampleData();
- System.err.println(list);
- List<Map<String, BigDecimal>> result = processData(list);
- result.forEach(System.out::println);
+ @GetMapping(value = "/getGunIdsByUserId")
+ @ApiOperation(value = "查询当前用户正在充电中的枪id集合", tags = {"小程序-首页-用户充电订单信息"})
+ public R<List<Integer>> getGunIdsByUserId() {
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ List<TChargingOrder> list = chargingOrderService.list(Wrappers.lambdaQuery(TChargingOrder.class)
+ .eq(TChargingOrder::getAppUserId, userId)
+ .eq(TChargingOrder::getStatus, 3));
+ List<Integer> gunIds = list.stream().map(TChargingOrder::getChargingGunId).collect(Collectors.toList());
+ return R.ok(gunIds);
}
+
private static List<TChargingOrder> getSampleData() {
// 这里可以替换为实际查询逻辑
List<TChargingOrder> list = new ArrayList<>();
--
Gitblit v1.7.1