bug

jiangqs

2023-07-26 d9e75c8c09738b31c375e3b843a3f2d4927f325f

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java

@@ -3102,7 +3102,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;
    }

    /**