bug修改

huliguo

昨天 d617e84caebaf2e7aa09c55cb2bd89c5a23ef8ac

 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));
    }