功能优化

Pu Zhibing

2026-01-06 15b0467aa04f8176e72dcc9905fb37117cbfc946

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java

@@ -70,20 +70,29 @@
                }
            }else{
                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(shopGoods1.getSalesPrice());
                    merGoodsPageVo.setUnifiedServerNum(shopGoods1.getServiceNum());
                }else{
                if(null == shop1){
                    merGoodsPageVo.setModifyPricePermission(1);
                    merGoodsPageVo.setIsUnifiedPrice(0);
                    if(null != shopGoods){
                        merGoodsPageVo.setUnifiedPrice(shopGoods.getSalesPrice());
                        merGoodsPageVo.setUnifiedServerNum(shopGoods.getServiceNum());
                    }
                }else{
                    ShopGoods shopGoods1 = shopGoodsService.getByShopIdAndGoodsId(shop1.getShopId(), merGoodsPageVo.getGoodsId());
                    //经销商设置了统一售价
                    if(null != shopGoods1){
                        merGoodsPageVo.setModifyPricePermission(0);
                        merGoodsPageVo.setIsUnifiedPrice(1);
                        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());
                        }
                    }
                }
            }