From 10ca4029e4fca9ec768af25fab7ff0dd13408b7e3fb7ac45bb4112b1d43659b5 Mon Sep 17 00:00:00 2001 From: yanglei Date: Tue, 6 Jan 2026 11:02:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=94=AF=E4=BB=98=E4=B8=8B?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/controller/EbikeOrderController.java | 21 ------- .../controller/EbikePaymentController.java | 18 ------ .../controller/EbikeWxPaymentController.java | 55 +++++++++++++++++++ 3 files changed, 55 insertions(+), 39 deletions(-) create mode 100644 ebike-user/src/main/java/com/cdzy/user/controller/EbikeWxPaymentController.java diff --git a/ebike-user/src/main/java/com/cdzy/user/controller/EbikeOrderController.java b/ebike-user/src/main/java/com/cdzy/user/controller/EbikeOrderController.java index e2eb9c5..0abb3c9 100644 --- a/ebike-user/src/main/java/com/cdzy/user/controller/EbikeOrderController.java +++ b/ebike-user/src/main/java/com/cdzy/user/controller/EbikeOrderController.java @@ -1,7 +1,5 @@ package com.cdzy.user.controller; -import com.cdzy.common.enums.Code; -import com.cdzy.common.ex.EbikeException; import com.cdzy.common.model.request.PageParam; import com.cdzy.common.model.response.JsonResult; import com.cdzy.user.model.dto.EbikeUserCyclingDto; @@ -11,10 +9,8 @@ import com.cdzy.user.model.vo.EbikeBikeInfoVo; import com.cdzy.user.model.vo.EbikeRevenueStatisticsVo; import com.cdzy.user.model.vo.EbikeUserAllOrdersVo; import com.cdzy.user.service.EbikeOrderService; -import com.ebike.feign.clients.PaymentFeignClient; import com.ebike.feign.model.dto.FeignEbikeDto; import com.ebike.feign.model.vo.FeignEbikeBikeRadiusVo; -import com.ebike.feign.model.vo.FeignEbikeWxHandleNotifyVo; import com.mybatisflex.core.paginate.Page; import jakarta.annotation.Resource; import jakarta.validation.constraints.NotNull; @@ -43,9 +39,6 @@ public class EbikeOrderController { @Resource private EbikeOrderService ebikeOrderService; - @Resource - private PaymentFeignClient paymentFeignClient; - /** * 车辆列表 * @@ -143,18 +136,4 @@ public class EbikeOrderController { List revenueStatistics = ebikeOrderService.getRevenueStatistics(); return JsonResult.success(revenueStatistics); } - - /** - * 通过商户(骑行)订单订单号查询支付订单状态 - * - * @param orderId 订单id - */ - @GetMapping("/queryOrderStatus/{orderId}") - public JsonResult queryOrderStatusById(@PathVariable(name = "orderId") Long orderId) { - JsonResult jsonResult = paymentFeignClient.queryOrderStatusById(orderId); - if (jsonResult.getCode() != Code.SUCCESS) { - throw new EbikeException(jsonResult.getMessage()); - } - return JsonResult.success(jsonResult.getData()); - } } diff --git a/ebike-user/src/main/java/com/cdzy/user/controller/EbikePaymentController.java b/ebike-user/src/main/java/com/cdzy/user/controller/EbikePaymentController.java index f48d15f..bf33cea 100644 --- a/ebike-user/src/main/java/com/cdzy/user/controller/EbikePaymentController.java +++ b/ebike-user/src/main/java/com/cdzy/user/controller/EbikePaymentController.java @@ -1,12 +1,8 @@ package com.cdzy.user.controller; -import com.cdzy.common.enums.Code; -import com.cdzy.common.ex.EbikeException; import com.cdzy.common.model.response.JsonResult; import com.cdzy.user.model.entity.EbikePayment; import com.cdzy.user.service.EbikePaymentService; -import com.ebike.feign.clients.PaymentFeignClient; -import com.fasterxml.jackson.databind.JsonNode; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -27,9 +23,6 @@ public class EbikePaymentController { @Resource private EbikePaymentService ebikePaymentService; - @Resource - private PaymentFeignClient paymentFeignClient; - /** * 根据订单号获取支付订单 * @@ -42,15 +35,4 @@ public class EbikePaymentController { return JsonResult.success(ebikePayment); } - /** - * 用户支付下单。 - */ - @GetMapping("/prepay") - public JsonResult prepay(@RequestParam("orderId") Long orderId) { - JsonResult jsonResult = paymentFeignClient.prepay(orderId); - if (jsonResult.getCode() != Code.SUCCESS) { - throw new EbikeException(jsonResult.getMessage()); - } - return JsonResult.success(jsonResult.getData()); - } } diff --git a/ebike-user/src/main/java/com/cdzy/user/controller/EbikeWxPaymentController.java b/ebike-user/src/main/java/com/cdzy/user/controller/EbikeWxPaymentController.java new file mode 100644 index 0000000..1c32eb2 --- /dev/null +++ b/ebike-user/src/main/java/com/cdzy/user/controller/EbikeWxPaymentController.java @@ -0,0 +1,55 @@ +package com.cdzy.user.controller; + +import com.cdzy.common.enums.Code; +import com.cdzy.common.ex.EbikeException; +import com.cdzy.common.model.response.JsonResult; +import com.ebike.feign.clients.PaymentFeignClient; +import com.ebike.feign.model.vo.FeignEbikeWxHandleNotifyVo; +import com.fasterxml.jackson.databind.JsonNode; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author yanglei + * @since 2026-01-06 11:00 + */ +@Slf4j +@RestController +@RequestMapping("/wxPayment") +public class EbikeWxPaymentController { + + @Resource + private PaymentFeignClient paymentFeignClient; + + /** + * 通过商户(骑行)订单订单号查询支付订单状态 + * + * @param orderId 订单id + */ + @GetMapping("/queryOrderStatus/{orderId}") + public JsonResult queryOrderStatusById(@PathVariable(name = "orderId") Long orderId) { + JsonResult jsonResult = paymentFeignClient.queryOrderStatusById(orderId); + if (jsonResult.getCode() != Code.SUCCESS) { + throw new EbikeException(jsonResult.getMessage()); + } + return JsonResult.success(jsonResult.getData()); + } + + + /** + * 用户支付下单。 + */ + @GetMapping("/prepay") + public JsonResult prepay(@RequestParam("orderId") Long orderId) { + JsonResult jsonResult = paymentFeignClient.prepay(orderId); + if (jsonResult.getCode() != Code.SUCCESS) { + throw new EbikeException(jsonResult.getMessage()); + } + return JsonResult.success(jsonResult.getData()); + } +}