From d9e75c8c09738b31c375e3b843a3f2d4927f325f Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期三, 26 七月 2023 09:13:29 +0800 Subject: [PATCH] bug --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerTotalOrderVo.java | 3 +++ ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerTotalOrderVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerTotalOrderVo.java index 06d6012..b9ee078 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerTotalOrderVo.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerTotalOrderVo.java @@ -15,6 +15,9 @@ @Data public class MerTotalOrderVo { + @ApiModelProperty(value = "是否代理商0否1是") + private Integer agencyFlag; + @ApiModelProperty(value = "总订单数") private Integer orderTotal; 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 9cd4c87..52cceca 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 @@ -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; } /** -- Gitblit v1.7.1