bug

jiangqs

2023-07-26 add86a49cc69b6882500c95dd67a2ac826c35526

 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;
    }