From 11e778f72b830a4050c293d78694417d32055727 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 20 十月 2023 20:39:55 +0800
Subject: [PATCH] 对接第三方分账接口
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java | 40 ++++++++++++----------------------------
1 files changed, 12 insertions(+), 28 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 3f3301b..9506b24 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,6 +2,7 @@
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.*;
@@ -74,21 +75,15 @@
}
@RequestMapping(value = "/placeOrder", method = RequestMethod.POST)
- @ApiOperation(value = "创建订单")
+ @ApiOperation(value = "创建订单")//todo 支付
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());
-
- if (userId != null) {
- Member member = memberService.getMember(userId).getData();
- appPlaceOrderDto.setUserId(userId);
- if (member != null) {
- appPlaceOrderDto.setOpenid(member.getMiniOpenid());
- appPlaceOrderDto.setShopId(member.getRelationShopId());
- }
- }
AppPlaceOrderVo appPlaceOrderVo = orderService.placeOrder(appPlaceOrderDto);
return R.ok(appPlaceOrderVo);
}
@@ -98,15 +93,11 @@
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());
- if (userId != null) {
- Member member = memberService.getMember(userId).getData();
- appPlaceActivityDto.setUserId(userId);
- if (member != null && member.getRelationShopId() != null) {
- appPlaceActivityDto.setOpenid(member.getMiniOpenid());
- appPlaceActivityDto.setShopId(member.getRelationShopId());
- }
- }
AppPlaceOrderVo appPlaceOrderVo = orderService.placeActivityOrder(appPlaceActivityDto);
return R.ok(appPlaceOrderVo);
}
@@ -115,14 +106,7 @@
@ApiOperation(value = "分页获取用户订单")
public R<Page<AppUserOrderPageVo>> pageUserOrder(@RequestBody AppUserOrderPageDto appUserOrderPageDto) {
Long userId = SecurityUtils.getUserId();
- if (userId != null) {
- Member member = memberService.getMember(userId).getData();
- appUserOrderPageDto.setUserId(userId);
- if (member != null && member.getRelationShopId() != null) {
- appUserOrderPageDto.setShopId(member.getRelationShopId());
- }
- }
- logger.info("appUserOrderPageDto:" + appUserOrderPageDto.toString());
+ appUserOrderPageDto.setUserId(userId);
Page<AppUserOrderPageVo> page = new Page<>();
page.setSize(appUserOrderPageDto.getPageSize());
page.setCurrent(appUserOrderPageDto.getPageNum());
@@ -152,7 +136,7 @@
}
@RequestMapping(value = "/payOrder", method = RequestMethod.POST)
- @ApiOperation(value = "支付订单")
+ @ApiOperation(value = "支付订单")//todo 支付
public R<AppPlaceOrderVo> payOrder(@RequestBody AppBaseGetDto appBaseGetDto) {
Long userId = SecurityUtils.getUserId();
AppPlaceOrderVo appPlaceOrderVo = orderService.payOrder(appBaseGetDto.getId());
@@ -160,7 +144,7 @@
}
@RequestMapping(value = "/cancelOrder", method = RequestMethod.POST)
- @ApiOperation(value = "取消订单")
+ @ApiOperation(value = "取消订单")//todo 退款
public R cancelOrder(@RequestBody AppBaseGetDto appBaseGetDto) {
Long userId = SecurityUtils.getUserId();
orderService.cancelOrder(appBaseGetDto.getId());
--
Gitblit v1.7.1