From 1da12c0ab6c5625fcd1295223f39c4249421f5be Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 24 九月 2025 18:46:34 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 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 921b2a3..5d0550a 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,12 +57,20 @@
page.setOptimizeCountSql(false);
List<MerGoodsPageVo> merGoodsPageVoList = goodsService.pageMerShopGoods(page, merGoodsPageDto);
Shop shop = remoteShopService.getShop(merGoodsPageDto.getShopId()).getData();
- if (null != shop.getBelongShopId()){
- Shop belongShop = remoteShopService.getShop(shop.getBelongShopId()).getData();
- merGoodsPageVoList.forEach(merGoodsPageVo -> {
- ShopGoods shopGoods = shopGoodsService.getByShopIdAndGoodsId(merGoodsPageDto.getShopId(), merGoodsPageVo.getGoodsId());
+ merGoodsPageVoList.forEach(merGoodsPageVo -> {
+ ShopGoods shopGoods = shopGoodsService.getByShopIdAndGoodsId(merGoodsPageDto.getShopId(), merGoodsPageVo.getGoodsId());
+ //经销商不限制修改价格权限
+ if(1 == shop.getShopType()){
+ merGoodsPageVo.setModifyPricePermission(1);
+ merGoodsPageVo.setIsUnifiedPrice(0);
+ if (null != shopGoods) {
+ merGoodsPageVo.setIsUnifiedPrice(1);
+ merGoodsPageVo.setUnifiedPrice(shopGoods.getSalesPrice());
+ merGoodsPageVo.setUnifiedServerNum(shopGoods.getServiceNum());
+ }
+ }else{
//后台开启经销商统一售价，且经销商设置了统一售价，加盟商不能修改价格
- if (1 == belongShop.getModifyPricePermission() && null != shopGoods) {
+ if (1 == shop.getModifyPricePermission() && null != shopGoods) {
merGoodsPageVo.setModifyPricePermission(0);
merGoodsPageVo.setIsUnifiedPrice(1);
merGoodsPageVo.setUnifiedPrice(shopGoods.getSalesPrice());
@@ -71,9 +79,9 @@
merGoodsPageVo.setModifyPricePermission(1);
merGoodsPageVo.setIsUnifiedPrice(0);
}
- });
- }
+ }
+ });
return R.ok(page.setRecords(merGoodsPageVoList));
}
--
Gitblit v1.7.1