jiangqs
2023-07-26 0b806dd3c5159d8fac767cf027b0301e583d1161
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -3108,7 +3108,15 @@
     */
    @Override
    public MerTotalOrderVo totalMerOrder(MerBaseDto merBaseDto) {
        return orderMapper.totalMerOrder(merBaseDto.getShopId());
        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;
    }
    /**