From 1ca4c6c6c7861c07980ad0dcd8d5df4b0219bfdc Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 06 九月 2023 19:01:48 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java | 22 ----------------------
1 files changed, 0 insertions(+), 22 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..3f3301b 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;
@@ -85,20 +84,9 @@
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);
@@ -117,16 +105,6 @@
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);
--
Gitblit v1.7.1