From 687dbd8e6ababc010a3da5503b95cd62cecf9f02 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 23 五月 2023 18:06:45 +0800
Subject: [PATCH] 拆分订单和商品服务
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 6eb203e..94236c6 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
@@ -5,9 +5,9 @@
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.domain.dto.*;
+import com.ruoyi.order.domain.pojo.order.Order;
import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.service.order.OrderService;
-import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.domain.dto.AppBaseGetDto;
import com.ruoyi.system.api.domain.dto.AppMemberBindingDto;
import com.ruoyi.system.api.domain.poji.member.Member;
@@ -33,14 +33,13 @@
@RequestMapping("/app/order")
public class AppOrderController extends BaseController {
- @Autowired
- private RemoteMemberService memberService;
+
@Autowired
private OrderService orderService;
- @RequestMapping(value = "/buyGoods", method = RequestMethod.POST)
+ /*@RequestMapping(value = "/buyGoods", method = RequestMethod.POST)
@ApiOperation(value = "购买商品")
public R<AppSureOrderVo> buyGoods(@RequestBody AppSureOrderDto appSureOrderDto) {
Long userId = SecurityUtils.getUserId();
@@ -122,7 +121,12 @@
@ApiOperation(value = "支付订单(临时)")
public R<AppPlaceOrderVo> placeOrder(@RequestBody AppBaseGetDto appBaseGetDto) {
Long userId = SecurityUtils.getUserId();
- AppPlaceOrderVo appPlaceOrderVo = null;
+ AppPlaceOrderVo appPlaceOrderVo = new AppPlaceOrderVo();
+ Order order = orderService.getById(appBaseGetDto.getId());
+ appPlaceOrderVo.setOrderId(order.getOrderId());
+ appPlaceOrderVo.setOrderNo(order.getOrderNo());
+ appPlaceOrderVo.setPayMoney(order.getPayMoney());
+ appPlaceOrderVo.setUnpaidMoney(order.getReceivableMoney().subtract(order.getPayMoney()));
return R.ok(appPlaceOrderVo);
}
@@ -132,6 +136,6 @@
Long userId = SecurityUtils.getUserId();
orderService.cancelOrder(appBaseGetDto.getId());
return R.ok();
- }
+ }*/
}
--
Gitblit v1.7.1