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 | 61 +++++++++++++++++++++++++-----
1 files changed, 50 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 128fe27..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,8 @@
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;
import com.ruoyi.common.security.service.TokenService;
@@ -10,12 +12,22 @@
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.ChargingOrderQuery;
import com.ruoyi.order.api.query.TChargingCountQuery;
+import com.ruoyi.order.api.vo.ChargingOrderVO;
+import com.ruoyi.order.api.vo.TCharingOrderVO;
+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.dto.*;
import com.ruoyi.order.service.TChargingOrderService;
import com.ruoyi.order.service.TOrderEvaluateService;
import com.ruoyi.order.service.TOrderEvaluateTagService;
+import com.ruoyi.payment.api.feignClient.AliPaymentClient;
import com.ruoyi.payment.api.feignClient.WxPaymentClient;
+import com.ruoyi.payment.api.vo.AliQueryOrder;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -26,6 +38,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.io.PrintWriter;
import java.util.List;
import java.util.Map;
import java.util.List;
@@ -49,8 +62,6 @@
private TokenService tokenService;
@Autowired
private TOrderEvaluateService orderEvaluateService;
- @Autowired
- private TOrderEvaluateTagService orderEvaluateTagService;
@Resource
private WxPaymentClient wxPaymentClient;
@@ -58,8 +69,33 @@
@Resource
private RedisService redisService;
+ @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")
@@ -161,7 +197,7 @@
@ResponseBody
@PostMapping(value = "/paymentChargingOrder")
@ApiOperation(value = "支付充电充值费用", tags = {"小程序-扫一扫"})
- public AjaxResult paymentChargingOrder(AddChargingOrder addChargingOrder){
+ public AjaxResult paymentChargingOrder(@RequestBody AddChargingOrder addChargingOrder){
return chargingOrderService.paymentChargingOrder(addChargingOrder);
}
@@ -187,20 +223,23 @@
/**
* 支付宝支付成功后的回调
- * @param request
*/
@ResponseBody
@PostMapping(value = "/chargingOrderALICallback")
- public void chargingOrderALICallback(HttpServletRequest request){
- Map<String, Object> data = wxPaymentClient.payNotify(request).getData();
- if(null != data){
- String out_trade_no = data.get("out_trade_no").toString();
- String transaction_id = data.get("transaction_id").toString();
- String attach = data.get("attach").toString();
+ public void chargingOrderALICallback(@RequestBody AliQueryOrder aliQueryOrder, HttpServletResponse response){
+ try {
+ String out_trade_no = aliQueryOrder.getOutTradeNo();
+ String transaction_id = aliQueryOrder.getTradeNo();
+ String attach = aliQueryOrder.getPassbackParams();
AjaxResult ajaxResult = chargingOrderService.chargingOrderCallback(2, out_trade_no, transaction_id, attach);
if(ajaxResult.isSuccess()){
-
+ PrintWriter writer = response.getWriter();
+ writer.println("success");
+ writer.flush();
+ writer.close();
}
+ }catch (Exception e){
+ e.printStackTrace();
}
}
--
Gitblit v1.7.1