From cead7b98d5cebc0825b919799e23732877361de0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 20 六月 2025 18:39:58 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java
index 9506b24..11ebe08 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.domain.dto.*;
@@ -75,13 +74,10 @@
}
@RequestMapping(value = "/placeOrder", method = RequestMethod.POST)
- @ApiOperation(value = "创建订单")//todo 支付
+ @ApiOperation(value = "创建订单")
public R<AppPlaceOrderVo> placeOrder(@RequestBody AppPlaceOrderDto appPlaceOrderDto) {
LoginUser loginUser = SecurityUtils.getLoginUser();
Long userId = loginUser.getUserid();
-// if(1==1){
-// throw new ServiceException("支付功能尚未开通,请联系客服");
-// }
appPlaceOrderDto.setUserId(userId);
appPlaceOrderDto.setSpbillCreateIp(loginUser.getIpaddr());
AppPlaceOrderVo appPlaceOrderVo = orderService.placeOrder(appPlaceOrderDto);
@@ -93,9 +89,6 @@
public R<AppPlaceOrderVo> placeActivityOrder(@Validated @RequestBody AppPlaceActivityDto appPlaceActivityDto) {
LoginUser loginUser = SecurityUtils.getLoginUser();
Long userId = loginUser.getUserid();
-// if(1==1){
-// throw new ServiceException("支付功能尚未开通,请联系客服");
-// }
appPlaceActivityDto.setUserId(userId);
appPlaceActivityDto.setSpbillCreateIp(loginUser.getIpaddr());
AppPlaceOrderVo appPlaceOrderVo = orderService.placeActivityOrder(appPlaceActivityDto);
@@ -136,7 +129,7 @@
}
@RequestMapping(value = "/payOrder", method = RequestMethod.POST)
- @ApiOperation(value = "支付订单")//todo 支付
+ @ApiOperation(value = "支付订单【2.0】")
public R<AppPlaceOrderVo> payOrder(@RequestBody AppBaseGetDto appBaseGetDto) {
Long userId = SecurityUtils.getUserId();
AppPlaceOrderVo appPlaceOrderVo = orderService.payOrder(appBaseGetDto.getId());
@@ -144,7 +137,7 @@
}
@RequestMapping(value = "/cancelOrder", method = RequestMethod.POST)
- @ApiOperation(value = "取消订单")//todo 退款
+ @ApiOperation(value = "取消订单")
public R cancelOrder(@RequestBody AppBaseGetDto appBaseGetDto) {
Long userId = SecurityUtils.getUserId();
orderService.cancelOrder(appBaseGetDto.getId());
--
Gitblit v1.7.1