From a41e23347029bf69a3f59438749658252de81d2e Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 15 十月 2024 09:41:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java |   49 +++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 41 insertions(+), 8 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 ea4a3c8..3636697 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;
 
 
     /**
@@ -471,6 +475,7 @@
     @ResponseBody
     @PostMapping(value = "/securityDetection")
     public void securityDetection(@RequestBody SecurityDetectionVO securityDetection){
+        log.error("-------------------安全检测数据-------------------：" + securityDetection);
         chargingOrderService.securityDetection(securityDetection);
     }
     
@@ -571,6 +576,17 @@
     public void terminateSuccessfulResponse(@RequestBody PlatformStopChargingReplyVO platformStopChargingReply){
         log.error("-------------------远程停止充电请求应答-------------------：" + platformStopChargingReply);
         chargingOrderService.terminateSuccessfulResponse(platformStopChargingReply);
+    }
+    
+    
+    /**
+     * 停止充电返回账单后计算费用
+     * @param vo
+     */
+    @PostMapping("/endChargeBillingCharge")
+    public void endChargeBillingCharge(@RequestBody TransactionRecordMessageVO vo){
+        log.error("-------------------停止充电返回账单后计算费用-------------------：" + vo);
+        chargingOrderService.endChargeBillingCharge(vo);
     }
     
     
@@ -1301,8 +1317,7 @@
 
     }
 
-    @Resource
-    private TOrderInvoiceService invoiceService;
+    
     @ResponseBody
     @GetMapping(value = "/work/shopOrder")
     @ApiOperation(value = "购物订单统计", tags = {"管理后台-工作台"})
@@ -1335,14 +1350,18 @@
             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() {
@@ -1395,6 +1414,7 @@
      */
     @PostMapping("/endCharge")
     public void endCharge(@RequestParam("code") String code){
+        log.error(code + "：-------------------充电桩自动结束充电-------------------");
         chargingOrderService.endCharge(code, 2);
     }
 
@@ -1404,6 +1424,7 @@
      */
     @PostMapping("/excelEndCharge")
     public void excelEndCharge(@RequestParam("code") String code){
+        log.error(code + "：-------------------充电异常，停止充电-------------------");
         chargingOrderService.excelEndCharge(code);
     }
 
@@ -1428,4 +1449,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