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 | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 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 114a346..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
@@ -55,6 +55,7 @@
import com.ruoyi.order.service.*;
import com.ruoyi.order.service.impl.TChargingOrderServiceImpl;
import com.ruoyi.order.util.PreviousSixMonths;
+import com.ruoyi.order.vo.EndOfChargePageInfo;
import com.ruoyi.payment.api.feignClient.AliPaymentClient;
import com.ruoyi.payment.api.feignClient.WxPaymentClient;
import com.ruoyi.payment.api.vo.AliQueryOrder;
@@ -143,6 +144,9 @@
private AppUserCarClient appUserCarClient;
@Resource
private TChargingOrderAccountingStrategyService chargingOrderAccountingStrategyService;
+
+ @Resource
+ private TOrderInvoiceService invoiceService;
/**
@@ -575,6 +579,17 @@
}
+ /**
+ * 停止充电返回账单后计算费用
+ * @param vo
+ */
+ @PostMapping("/endChargeBillingCharge")
+ public void endChargeBillingCharge(@RequestBody TransactionRecordMessageVO vo){
+ log.error("-------------------停止充电返回账单后计算费用及修改业务状态-------------------：" + vo);
+ chargingOrderService.endChargeBillingCharge(vo);
+ }
+
+
@ResponseBody
@@ -698,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);
}
@@ -1302,8 +1320,7 @@
}
- @Resource
- private TOrderInvoiceService invoiceService;
+
@ResponseBody
@GetMapping(value = "/work/shopOrder")
@ApiOperation(value = "购物订单统计", tags = {"管理后台-工作台"})
@@ -1348,14 +1365,6 @@
return R.ok(gunIds);
}
- 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);
- }
private static List<TChargingOrder> getSampleData() {
@@ -1443,4 +1452,16 @@
chargingOrderService.updateById(chargingOrder);
return R.ok();
}
+
+
+ @ResponseBody
+ @GetMapping(value = "/getEndOfChargePageInfo/{id}")
+ @ApiOperation(value = "获取充电结束页面数据", tags = {"小程序-扫一扫"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "订单id", required = true)
+ })
+ public AjaxResult<EndOfChargePageInfo> getEndOfChargePageInfo(@PathVariable("id") String id){
+ EndOfChargePageInfo endOfChargePageInfo = chargingOrderService.getEndOfChargePageInfo(id);
+ return AjaxResult.success(endOfChargePageInfo);
+ }
}
--
Gitblit v1.7.1