From 797dd8cb9ca3bf041f3e826c78c537e2d6afda1b Mon Sep 17 00:00:00 2001
From: tangqian <tangqian..110>
Date: Fri, 19 May 2023 17:35:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E4=BB=98=E5=AE=9D=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shop/dal/dataobject/recharge/RechargeOrderDO.java       | 3 ++-
 .../shop/dal/dataobject/recharge/RechargeOrderInfoDO.java   | 3 ++-
 .../shop/service/order/impl/StoreOrderServiceImpl.java      | 6 ++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/recharge/RechargeOrderDO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/recharge/RechargeOrderDO.java
index f4b3685e6..3f9f5b217 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/recharge/RechargeOrderDO.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/recharge/RechargeOrderDO.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.shop.dal.dataobject.recharge;
 
+import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 import java.util.*;
 import java.math.BigDecimal;
@@ -29,7 +30,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class RechargeOrderDO extends BaseDO {
+public class RechargeOrderDO extends TenantBaseDO {
 
     /**
      * 订单ID
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/recharge/RechargeOrderInfoDO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/recharge/RechargeOrderInfoDO.java
index 055a62784..9af2deff2 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/recharge/RechargeOrderInfoDO.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/recharge/RechargeOrderInfoDO.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.shop.dal.dataobject.recharge;
 
+import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 import java.util.*;
 import java.time.LocalDateTime;
@@ -22,7 +23,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class RechargeOrderInfoDO extends BaseDO {
+public class RechargeOrderInfoDO extends TenantBaseDO {
 
     /**
      * 主键
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java
index d282a5652..2d810972a 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java
@@ -14,6 +14,8 @@ import cn.iocoder.yudao.framework.common.util.date.DateUtils;
 import cn.iocoder.yudao.framework.pay.properties.AliPayProperties;
 import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
+import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
 import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
 import cn.iocoder.yudao.module.member.api.user.dto.PromoterDTO;
@@ -1149,6 +1151,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
     }
 
     @Override
+    @TenantIgnore
     @Transactional
     public InitOrderResponse memberTopUp(OrderContentRequest request, HttpServletRequest servletRequest) {
         LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
@@ -1352,6 +1355,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
 
 
     private RechargeOrderDO initializeOrder(OrderContentRequest request, String code, MemberUserRespDTO user, PromoterDTO promoterDTO) {
+        Long tenantId = TenantContextHolder.getTenantId();
         RechargeOrderDO orderDO = new RechargeOrderDO();
         List<OrderContentRequest.OrderInfo> orderInfos = request.getOrderInfos();
         orderDO.setOrderId(code);
@@ -1372,6 +1376,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
         orderDO.setBeforePayPrice(sum);
         orderDO.setPromoterId(user.getPromoterId());
         orderDO.setDeptId(promoterDTO.getDeptId());
+        orderDO.setTenantId(tenantId);
         rechargeOrderMapper.insert(orderDO);
         List<RechargeOrderInfoDO> infoDOS = new ArrayList<>();
         orderInfos.forEach(info -> {
@@ -1387,6 +1392,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
             infoDO.setDeptId(promoterDTO.getDeptId());
             infoDO.setUid(user.getId());
             infoDO.setRechargeGearId(info.getGearId());
+            infoDO.setTenantId(tenantId);
             infoDOS.add(infoDO);
         });
         rechargeOrderInfoMapper.insertBatch(infoDOS);