bug修改

huliguo

1 天以前 d617e84caebaf2e7aa09c55cb2bd89c5a23ef8ac

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

@@ -57,6 +57,7 @@
        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(belongShop.getShopId(), merGoodsPageVo.getGoodsId());
@@ -71,6 +72,8 @@
                merGoodsPageVo.setIsUnifiedPrice(0);
            }
        });
        }

        return R.ok(page.setRecords(merGoodsPageVoList));
    }