huliguo
2025-07-30 68b7f670f7fe6fbe79e2f0682ac27b6ea1a0c417
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java
@@ -60,7 +60,7 @@
        if (null != shop.getBelongShopId()){
            Shop belongShop = remoteShopService.getShop(shop.getBelongShopId()).getData();
            merGoodsPageVoList.forEach(merGoodsPageVo -> {
                ShopGoods shopGoods = shopGoodsService.getByShopIdAndGoodsId(belongShop.getShopId(), merGoodsPageVo.getGoodsId());
                ShopGoods shopGoods = shopGoodsService.getByShopIdAndGoodsId(merGoodsPageDto.getShopId(), merGoodsPageVo.getGoodsId());
                //后台开启经销商统一售价,且经销商设置了统一售价,加盟商不能修改价格
                if (1 == belongShop.getModifyPricePermission() && null != shopGoods) {
                    merGoodsPageVo.setModifyPricePermission(0);