From 8b0f0fa277a2390463c6582c4fbe8600e1e53ced Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 31 五月 2023 18:19:16 +0800
Subject: [PATCH] 用户管理商户管理

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index 793e76b..b21a0dd 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -948,6 +948,16 @@
      */
     @Override
     public List<MgtMemberOrderPageVo> pageMgtMemberOrder(Page page, MgtMemberOrderPageDto mgtMemberOrderPageDto){
-        return orderMapper.pageMgtMemberOrder(page, mgtMemberOrderPageDto);
+        List<MgtMemberOrderPageVo> mgtMemberOrderPageVoList = orderMapper.pageMgtMemberOrder(page, mgtMemberOrderPageDto);
+        if(mgtMemberOrderPageVoList!=null&&!mgtMemberOrderPageVoList.isEmpty()){
+            Long shopId;
+            Shop shop;
+            for(MgtMemberOrderPageVo mgtMemberOrderPageVo : mgtMemberOrderPageVoList){
+                shopId = mgtMemberOrderPageVo.getShopId();
+                shop = remoteShopService.getShop(shopId).getData();
+                mgtMemberOrderPageVo.setShopName(shop.getShopName());
+            }
+        }
+        return mgtMemberOrderPageVoList;
     }
 }

--
Gitblit v1.7.1