From ebb38883f7e605a9f0764fc25b8661e6900c7c32 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 30 Jun 2025 12:33:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=9B=9E=E8=B0=83=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sqx/modules/orders/dao/OrdersDao.java | 1 + .../modules/orders/service/OrdersService.java | 4 ++ .../service/impl/OrdersServiceImpl.java | 6 +++ .../pay/controller/app/WuyouController.java | 37 ++++++++++--------- .../sqx/modules/pay/dao/PayDetailsDao.java | 1 + .../resources/mapper/orders/OrdersDao.xml | 4 ++ .../resources/mapper/pay/PayDetailsDao.xml | 4 ++ 7 files changed, 39 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/sqx/modules/orders/dao/OrdersDao.java b/src/main/java/com/sqx/modules/orders/dao/OrdersDao.java index 3203d5d9..7deaeb52 100644 --- a/src/main/java/com/sqx/modules/orders/dao/OrdersDao.java +++ b/src/main/java/com/sqx/modules/orders/dao/OrdersDao.java @@ -26,6 +26,7 @@ public interface OrdersDao extends BaseMapper { Double statisticsIncomeMoney(@Param("time") String time, @Param("flag") Integer flag, @Param("ordersType") Integer ordersType); Orders selectOrdersByCourseIdAndUserId(Long userId, Long courseId); + Orders getById(Long orderId, Long userId); List selectOrdersMoneyList(Integer flag, String time); diff --git a/src/main/java/com/sqx/modules/orders/service/OrdersService.java b/src/main/java/com/sqx/modules/orders/service/OrdersService.java index f5c280b5..824a76d3 100644 --- a/src/main/java/com/sqx/modules/orders/service/OrdersService.java +++ b/src/main/java/com/sqx/modules/orders/service/OrdersService.java @@ -5,6 +5,8 @@ import com.sqx.common.utils.Result; import com.sqx.modules.orders.dto.SummaryDTO; import com.sqx.modules.orders.entity.Orders; +import java.io.Serializable; + public interface OrdersService extends IService { /** * 处理所有订单 @@ -14,6 +16,8 @@ public interface OrdersService extends IService { */ Result insertOrders(Orders orders); + Orders getById(Long orderId, Long userId); + Result payMoney(Long orderId); Result insertCourseOrders(Long courseId, Long courseDetailsId, Long userId); diff --git a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java index 7066b922..d25df162 100644 --- a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java @@ -121,6 +121,12 @@ public class OrdersServiceImpl extends ServiceImpl implements } + @Override + public Orders getById(Long orderId, Long userId) { + return baseMapper.getById(orderId, userId); + } + + @Override public Result insertOrders(Orders orders) { //如果订单的种类是短剧 diff --git a/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java b/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java index bbd3582a..26682ea1 100644 --- a/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java +++ b/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.sqx.common.annotation.Debounce; import com.sqx.common.annotation.Limiting; import com.sqx.common.utils.Result; +import com.sqx.modules.app.annotation.Login; import com.sqx.modules.app.service.UserMoneyDetailsService; import com.sqx.modules.app.service.UserMoneyService; import com.sqx.modules.app.service.UserService; @@ -78,9 +79,10 @@ public class WuyouController { @Debounce(interval = 1000, value = "#orderId") @ApiOperation("支付订单") + @Login @GetMapping("/payOrder/{orderId}") - public Result payOrder(HttpServletRequest request, @PathVariable("orderId") Long orderId, @RequestParam(value = "payType", required = false) String payType) { - Orders order = ordersService.getById(orderId); + public Result payOrder(HttpServletRequest request,@RequestAttribute("userId") Long userId, @PathVariable("orderId") Long orderId, @RequestParam(value = "payType", required = false) String payType) { + Orders order = ordersService.getById(orderId,userId); if (order == null) { return Result.error("订单不存在"); } @@ -142,16 +144,15 @@ public class WuyouController { } @ApiOperation("查询订单支付结果") + @Login @GetMapping("/queryOrder/{orderId}") - @Debounce(value = "#orderId") - @Limiting(limitNum = 20) - public Result queryOrder(HttpServletRequest request, @PathVariable("orderId") Long orderId) { - Orders order = ordersService.getById(orderId); + public Result queryOrder(HttpServletRequest request,@RequestAttribute("userId") Long userId, @PathVariable("orderId") Long orderId) { + Orders order = ordersService.getById(orderId,userId); if (order == null) { return Result.error("订单不存在"); } - PayDetails payDetails = payDetailsDao.selectByOrderId(order.getOrdersNo()); + PayDetails payDetails = payDetailsDao.selectByOrderIdAndUserId(order.getOrdersNo(),userId); if (payDetails == null) { return Result.error("订单支付信息不存在"); } @@ -160,17 +161,17 @@ public class WuyouController { return Result.success().put("data", 1); } - BaseResp baseResp = wuyouPay.queryOrder(payDetails.getTradeNo(), order.getUserId(), order.getPayMoney().toString(), request.getHeader("User-Agent")); - if (baseResp.getCode() == null || baseResp.getCode() != 200) { - return Result.success().put("data", 0); - } - - if ("SUCCESS".equals(baseResp.getPayStatus())) { - payDetails.setThirdOrderNo(baseResp.getData().getOrder_sn()); -// ordersTask.updateOrderStatus(payDetails, order); - return Result.success().put("data", 1); - } - +// BaseResp baseResp = wuyouPay.queryOrder(payDetails.getTradeNo(), order.getUserId(), order.getPayMoney().toString(), request.getHeader("User-Agent")); +// if (baseResp.getCode() == null || baseResp.getCode() != 200) { +// return Result.success().put("data", 0); +// } +// +// if ("SUCCESS".equals(baseResp.getPayStatus())) { +// payDetails.setThirdOrderNo(baseResp.getData().getOrder_sn()); +//// ordersTask.updateOrderStatus(payDetails, order); +// return Result.success().put("data", 1); +// } +// return Result.success().put("data", 0); } diff --git a/src/main/java/com/sqx/modules/pay/dao/PayDetailsDao.java b/src/main/java/com/sqx/modules/pay/dao/PayDetailsDao.java index b2255126..1d83c61c 100644 --- a/src/main/java/com/sqx/modules/pay/dao/PayDetailsDao.java +++ b/src/main/java/com/sqx/modules/pay/dao/PayDetailsDao.java @@ -20,6 +20,7 @@ public interface PayDetailsDao extends BaseMapper { PayDetails selectByRemark(@Param("remark") String remark); PayDetails selectByOrderId(@Param("orderId") String orderId); + PayDetails selectByOrderIdAndUserId(@Param("orderId") String orderId, @Param("userId") Long userId); PayDetails selectOneByLimit(@Param("orderId") String ordersNo); diff --git a/src/main/resources/mapper/orders/OrdersDao.xml b/src/main/resources/mapper/orders/OrdersDao.xml index 0d6d916d..2ccd1004 100644 --- a/src/main/resources/mapper/orders/OrdersDao.xml +++ b/src/main/resources/mapper/orders/OrdersDao.xml @@ -165,6 +165,10 @@ select * from orders where user_id=#{userId} and course_id=#{courseId} and status=1 order by create_time desc limit 1 + + + +