From ff169f9a0417b73f0afac554cf2f9d048ac56c80 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 19 八月 2024 20:57:08 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 83 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 82 insertions(+), 1 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 d05882b..f20b8af 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
@@ -3,13 +3,30 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.BasePage;
+import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.api.model.TChargingOrder;
+import com.ruoyi.order.api.model.TOrderEvaluate;
import com.ruoyi.order.api.query.TChargingCountQuery;
+import com.ruoyi.order.dto.GetMyChargingOrderList;
+import com.ruoyi.order.dto.GetNoInvoicedOrder;
+import com.ruoyi.order.dto.MyChargingOrderInfo;
+import com.ruoyi.order.dto.MyChargingOrderList;
+import com.ruoyi.order.dto.OrderEvaluateVo;
import com.ruoyi.order.service.TChargingOrderService;
+import com.ruoyi.order.service.TOrderEvaluateService;
+import com.ruoyi.order.service.TOrderEvaluateTagService;
import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+import java.util.List;
/**
* <p>
@@ -26,6 +43,39 @@
@Resource
private TChargingOrderService chargingOrderService;
+ @Autowired
+ private TokenService tokenService;
+ @Autowired
+ private TOrderEvaluateService orderEvaluateService;
+ @Autowired
+ private TOrderEvaluateTagService orderEvaluateTagService;
+
+ @ResponseBody
+ @PostMapping(value = "/addEvaluate")
+ @ApiOperation(value = "添加评价", tags = {"小程序-扫一扫"})
+ public AjaxResult getMyChargingOrderList(@RequestBody OrderEvaluateVo dto){
+ dto.setAppUserId(tokenService.getLoginUserApplet().getUserId());
+ orderEvaluateService.addOrderEvaluate(dto);
+ return AjaxResult.success();
+ }
+ /**
+ * 查询用户最近一次充电记录使用的车辆
+ * @param
+ * @return
+ */
+ @GetMapping(value = "/getCar")
+ public R<Long> getCar() {
+ List<TChargingOrder> list = chargingOrderService.list(new LambdaQueryWrapper<TChargingOrder>()
+ .eq(TChargingOrder::getAppUserId, tokenService.getLoginUserApplet().getUserId())
+ .isNotNull(TChargingOrder::getAppUserCarId));
+ if (!list.isEmpty()){
+ // 最近使用的车辆id
+ Long size = list.get(0).getAppUserCarId();
+ return R.ok(size);
+ }else{
+ return R.ok(-1L);
+ }
+ }
/**
* 查询会员在本月有多少次享受了充电折扣
@@ -58,11 +108,42 @@
* @param chargingGunId 充电枪id
* @return
*/
- @GetMapping(value = "/getOrderDetailByGunId")
+ @PostMapping(value = "/getOrderDetailByGunId")
public R<TChargingOrder> getOrderDetailByGunId(@RequestParam("chargingGunId") Integer chargingGunId){
TChargingOrder one = chargingOrderService.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getChargingGunId, chargingGunId)
.eq(TChargingOrder::getDelFlag, 0).eq(TChargingOrder::getStatus, 3));
return R.ok(one);
}
+
+
+
+
+ @ResponseBody
+ @GetMapping(value = "/getMyChargingOrderList")
+ @ApiOperation(value = "获取充电记录列表", tags = {"小程序-充电记录"})
+ public AjaxResult<Map<String, Object>> getMyChargingOrderList(GetMyChargingOrderList query){
+ Map<String, Object> orderList = chargingOrderService.getMyChargingOrderList(query);
+ return AjaxResult.success(orderList);
+ }
+
+
+ @ResponseBody
+ @GetMapping(value = "/getMyChargingOrderInfo")
+ @ApiOperation(value = "获取充电记订单明细", tags = {"小程序-充电记录"})
+ public AjaxResult<MyChargingOrderInfo> getMyChargingOrderInfo(String id){
+ MyChargingOrderInfo myChargingOrderInfo = chargingOrderService.getMyChargingOrderInfo(id);
+ return AjaxResult.success(myChargingOrderInfo);
+ }
+
+
+
+ @ResponseBody
+ @GetMapping(value = "/getNoInvoicedOrder")
+ @ApiOperation(value = "获取未开票的订单数据", tags = {"小程序-充电发票"})
+ public AjaxResult<List<MyChargingOrderList>> getNoInvoicedOrder(@RequestBody GetNoInvoicedOrder query){
+ List<MyChargingOrderList> list = chargingOrderService.getNoInvoicedOrder(query);
+ return AjaxResult.success(list);
+ }
+
}
--
Gitblit v1.7.1