From add86a49cc69b6882500c95dd67a2ac826c35526 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 26 七月 2023 20:16:51 +0800
Subject: [PATCH] bug

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java |    6 ------
 1 files changed, 0 insertions(+), 6 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 282deb4..dd6bab7 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
@@ -3110,12 +3110,6 @@
     public MerTotalOrderVo totalMerOrder(MerBaseDto merBaseDto) {
         MerTotalOrderVo merTotalOrderVo = new MerTotalOrderVo();
         merTotalOrderVo = orderMapper.totalMerOrder(merBaseDto.getShopId());
-        Shop shop = remoteShopService.getShop(merBaseDto.getShopId()).getData();
-        if(shop.getShopType()==2){
-            merTotalOrderVo.setAgencyFlag(1);
-        }else{
-            merTotalOrderVo.setAgencyFlag(0);
-        }
         return merTotalOrderVo;
     }
 

--
Gitblit v1.7.1