From 3adbcc42d5f84c3c83d220543189361add81e04d Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 11 九月 2023 15:22:19 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java | 49 ++-----------------------------------------------
1 files changed, 2 insertions(+), 47 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 71fb6c3..b16c755 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
@@ -8,7 +8,6 @@
import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.service.order.OrderService;
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;
import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.system.api.service.RemoteMemberService;
@@ -81,26 +80,6 @@
Long userId = loginUser.getUserid();
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());
- if (member.getBindingFlag() != 1) {
- //绑定商户
- AppMemberBindingDto appMemberBindingDto = new AppMemberBindingDto();
- appMemberBindingDto.setShopId(appPlaceOrderDto.getShopId());
- appMemberBindingDto.setUserId(userId);
- appMemberBindingDto.setBindingFlag(1);
- appMemberBindingDto.setBindingType(1);
- memberService.updateMemberBinding(appMemberBindingDto);
- appPlaceOrderDto.setNewMemberFlag(1);
- }
- }
- }
AppPlaceOrderVo appPlaceOrderVo = orderService.placeOrder(appPlaceOrderDto);
return R.ok(appPlaceOrderVo);
}
@@ -110,25 +89,8 @@
public R<AppPlaceOrderVo> placeActivityOrder(@Validated @RequestBody AppPlaceActivityDto appPlaceActivityDto) {
LoginUser loginUser = SecurityUtils.getLoginUser();
Long userId = loginUser.getUserid();
+ 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());
- }
- if (member.getBindingFlag() != 1) {
- //绑定商户
- AppMemberBindingDto appMemberBindingDto = new AppMemberBindingDto();
- appMemberBindingDto.setShopId(appPlaceActivityDto.getShopId());
- appMemberBindingDto.setUserId(userId);
- appMemberBindingDto.setBindingFlag(1);
- appMemberBindingDto.setBindingType(2);
- memberService.updateMemberBinding(appMemberBindingDto);
- appPlaceActivityDto.setNewMemberFlag(1);
- }
- }
AppPlaceOrderVo appPlaceOrderVo = orderService.placeActivityOrder(appPlaceActivityDto);
return R.ok(appPlaceOrderVo);
}
@@ -137,14 +99,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());
--
Gitblit v1.7.1