From a5c5fc7c86c37519dbe42b148b47ebfc00f89ca9 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 09 七月 2025 10:56:42 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsServiceImpl.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsServiceImpl.java
index 32aacf3..d5496ed 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsServiceImpl.java
@@ -36,15 +36,15 @@
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.domain.vo.MerGoodsPriceListVo;
import com.ruoyi.system.api.domain.vo.MgtSelectGoodsPageVo;
-import com.ruoyi.system.api.domain.vo.ShopRelUserVo;
+import com.ruoyi.system.api.domain.vo.StaticsShopMgtGoodsVO;
import com.ruoyi.system.api.service.RemoteConfigService;
+import com.ruoyi.system.api.service.RemoteOrderService;
import com.ruoyi.system.api.service.RemoteShopService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
-import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -768,7 +768,34 @@
return list;
}
+ @Resource
+ private RemoteOrderService remoteOrderService;
+ @Override
+ public StaticsShopMgtGoodsVO staticsShopMgtGoods(PageShopMgtGoodsDTO pageShopMgtGoodsDTO) {
+ StaticsShopMgtGoodsVO vo = new StaticsShopMgtGoodsVO();
+ //1.查找门店
+ Shop shop = remoteShopService.getShop(pageShopMgtGoodsDTO.getShopId()).getData();
+ if (null == shop || shop.getDelFlag() != 0 || shop.getShopStatus() == -1) {
+ return vo;
+ }
+ List<Shop> shops = new ArrayList<>();
+ //2.判断门店是否经销商
+ if (shop.getShopType()==1){
+ //经销商 获取下级-加盟商ids
+ shops = remoteShopService.getFranchiseeIdsBYDealerId(shop.getShopId());
+ }
+ //将该门店加入
+ shops.add(shop);
+ List<Long> shopIds = shops.stream().map(Shop::getShopId).collect(Collectors.toList());
+ //查询信息
+ pageShopMgtGoodsDTO.setShopIds(shopIds);
+ //3.根据shopId查询商品ids
+ List<String> goodsId= goodsMapper.staticsShopMgtGoods(pageShopMgtGoodsDTO);
+
+ //查询商品销量 销售额
+ return remoteOrderService.getGoodsSellStatic(goodsId).getData();
+ }
@Override
public R<Void> updateGoodsPrice(UpdateGoodsPriceDTO updateGoodsPriceDTO) {
//判断当前登录人员类型
--
Gitblit v1.7.1