From d617e84caebaf2e7aa09c55cb2bd89c5a23ef8ac Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期六, 28 六月 2025 15:58:33 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java
index 8bdf72c..4fc2052 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java
@@ -57,20 +57,23 @@
page.setOptimizeCountSql(false);
List<MerGoodsPageVo> merGoodsPageVoList = goodsService.pageMerShopGoods(page, merGoodsPageDto);
Shop shop = remoteShopService.getShop(merGoodsPageDto.getShopId()).getData();
- Shop belongShop = remoteShopService.getShop(shop.getBelongShopId()).getData();
- merGoodsPageVoList.forEach(merGoodsPageVo -> {
- ShopGoods shopGoods = shopGoodsService.getByShopIdAndGoodsId(belongShop.getShopId(), merGoodsPageVo.getGoodsId());
- //后台开启经销商统一售价，且经销商设置了统一售价，加盟商不能修改价格
- if (1 == belongShop.getModifyPricePermission() && null != shopGoods) {
- merGoodsPageVo.setModifyPricePermission(0);
- merGoodsPageVo.setIsUnifiedPrice(1);
- merGoodsPageVo.setUnifiedPrice(shopGoods.getSalesPrice());
- merGoodsPageVo.setUnifiedServerNum(shopGoods.getServiceNum());
- } else {
- merGoodsPageVo.setModifyPricePermission(1);
- merGoodsPageVo.setIsUnifiedPrice(0);
- }
- });
+ if (null != shop.getBelongShopId()){
+ Shop belongShop = remoteShopService.getShop(shop.getBelongShopId()).getData();
+ merGoodsPageVoList.forEach(merGoodsPageVo -> {
+ ShopGoods shopGoods = shopGoodsService.getByShopIdAndGoodsId(belongShop.getShopId(), merGoodsPageVo.getGoodsId());
+ //后台开启经销商统一售价，且经销商设置了统一售价，加盟商不能修改价格
+ if (1 == belongShop.getModifyPricePermission() && null != shopGoods) {
+ merGoodsPageVo.setModifyPricePermission(0);
+ merGoodsPageVo.setIsUnifiedPrice(1);
+ merGoodsPageVo.setUnifiedPrice(shopGoods.getSalesPrice());
+ merGoodsPageVo.setUnifiedServerNum(shopGoods.getServiceNum());
+ } else {
+ merGoodsPageVo.setModifyPricePermission(1);
+ merGoodsPageVo.setIsUnifiedPrice(0);
+ }
+ });
+ }
+
return R.ok(page.setRecords(merGoodsPageVoList));
}
--
Gitblit v1.7.1