From a60adb2b6aadae6c0aba27995f20def8a9ffe632 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 05 十二月 2025 16:50:19 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 5d0550a..a368779 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
@@ -61,7 +61,7 @@
ShopGoods shopGoods = shopGoodsService.getByShopIdAndGoodsId(merGoodsPageDto.getShopId(), merGoodsPageVo.getGoodsId());
//经销商不限制修改价格权限
if(1 == shop.getShopType()){
- merGoodsPageVo.setModifyPricePermission(1);
+ merGoodsPageVo.setModifyPricePermission(shop.getModifyPricePermission());
merGoodsPageVo.setIsUnifiedPrice(0);
if (null != shopGoods) {
merGoodsPageVo.setIsUnifiedPrice(1);
@@ -69,15 +69,21 @@
merGoodsPageVo.setUnifiedServerNum(shopGoods.getServiceNum());
}
}else{
- //后台开启经销商统一售价，且经销商设置了统一售价，加盟商不能修改价格
- if (1 == shop.getModifyPricePermission() && null != shopGoods) {
+ Shop shop1 = remoteShopService.getShop(shop.getBelongShopId()).getData();
+ ShopGoods shopGoods1 = shopGoodsService.getByShopIdAndGoodsId(shop1.getShopId(), merGoodsPageVo.getGoodsId());
+ //经销商设置了统一售价
+ if(null != shopGoods1){
merGoodsPageVo.setModifyPricePermission(0);
merGoodsPageVo.setIsUnifiedPrice(1);
- merGoodsPageVo.setUnifiedPrice(shopGoods.getSalesPrice());
- merGoodsPageVo.setUnifiedServerNum(shopGoods.getServiceNum());
- } else {
+ merGoodsPageVo.setUnifiedPrice(shopGoods1.getSalesPrice());
+ merGoodsPageVo.setUnifiedServerNum(shopGoods1.getServiceNum());
+ }else{
merGoodsPageVo.setModifyPricePermission(1);
merGoodsPageVo.setIsUnifiedPrice(0);
+ if(null != shopGoods){
+ merGoodsPageVo.setUnifiedPrice(shopGoods.getSalesPrice());
+ merGoodsPageVo.setUnifiedServerNum(shopGoods.getServiceNum());
+ }
}
}
--
Gitblit v1.7.1