From 26a2026e45a11fa094b16326a0fffb1bb7b3d52c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 26 八月 2024 17:58:18 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 fd85e38..d9a6601 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.chargingPile.api.vo.SiteVO;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.redis.service.RedisService;
@@ -71,17 +72,30 @@
@Resource
private AliPaymentClient aliPaymentClient;
-
-
+ @Autowired
+ private AppUserClient appUserClient;
+
+
+
+
+
@ResponseBody
@PostMapping(value = "/chargingOrder")
@ApiOperation(value = "充电桩订单列表", tags = {"管理后台-订单管理"})
public AjaxResult<TCharingOrderVO> chargingOrder(@RequestBody ChargingOrderQuery dto){
+ List<Long> data = appUserClient.getUserIdsByPhone(dto.getPhone()).getData();
+ dto.setUserIds(data);
TCharingOrderVO res = chargingOrderService.chargingOrder(dto);
return AjaxResult.success(res);
}
+ @ResponseBody
+ @PostMapping(value = "/chargingOrderInfo")
+ @ApiOperation(value = "充电桩订单列表查看详情", tags = {"管理后台-订单管理"})
+ public AjaxResult<TCharingOrderVO> chargingOrderInfo(String orderId){
+ return AjaxResult.success();
+ }
@ResponseBody
@PostMapping(value = "/addEvaluate")
--
Gitblit v1.7.1