From 592be2e58086606551dd74235b6662fe02ab6db3 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 21 八月 2024 11:38:53 +0800
Subject: [PATCH] 添加接口
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 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 f20b8af..67c5090 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
@@ -10,20 +10,19 @@
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.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.WxPaymentClient;
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 javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
import java.util.List;
@@ -49,6 +48,12 @@
private TOrderEvaluateService orderEvaluateService;
@Autowired
private TOrderEvaluateTagService orderEvaluateTagService;
+
+ @Resource
+ private WxPaymentClient wxPaymentClient;
+
+
+
@ResponseBody
@PostMapping(value = "/addEvaluate")
@@ -145,5 +150,26 @@
return AjaxResult.success(list);
}
+
+
+ @ResponseBody
+ @PostMapping(value = "/paymentChargingOrder")
+ @ApiOperation(value = "支付充电充值费用", tags = {"小程序-扫一扫"})
+ public AjaxResult paymentChargingOrder(AddChargingOrder addChargingOrder){
+ return chargingOrderService.paymentChargingOrder(addChargingOrder);
+ }
+
+ /**
+ * 充电充值支付回调
+ * @param request
+ */
+ @ResponseBody
+ @PostMapping(value = "/chargingOrderWXCallback")
+ public void chargingOrderWXCallback(HttpServletRequest request){
+ Map<String, Object> data = wxPaymentClient.payNotify(request).getData();
+
+
+ wxPaymentClient.ack();
+ }
}
--
Gitblit v1.7.1