From b17d915d42ed6679fad448d86da4ea8a725446af Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 17 十二月 2024 11:23:59 +0800
Subject: [PATCH] 1
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
index b080dee..47f74b0 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
@@ -254,6 +254,14 @@
// 指定门店
List<GoodsShop> goodsShops = goodsShopService.list(new LambdaQueryWrapper<GoodsShop>()
.eq(GoodsShop::getGoodsId, goodsId));
+
+ for (GoodsShop goodsShop : goodsShops) {
+ Shop shop = shopMapper.selectById(goodsShop.getShopId());
+ goodsShop.setShopName(shop.getName());
+ goodsShop.setOwnerName(shop.getShopManager());
+ goodsShop.setPhone(shop.getPhone());
+ goodsShop.setAddress(shop.getAddress());
+ }
goods.setGoodsShopList(goodsShops);
// 指定用户
@@ -277,8 +285,15 @@
List<GoodsArea> goodsAreaList1 = new ArrayList<>();
listMap.forEach((s, goodsAreas) -> {
GoodsArea goodsArea = goodsAreas.get(0);
- goodsArea.setGoodsAreaList(goodsAreas);
- goodsAreaList1.add(goodsArea);
+ GoodsArea goodsArea1 = new GoodsArea();
+ goodsArea1.setProvinceCode(goodsArea.getProvinceCode());
+ goodsArea1.setCityCode(goodsArea.getCityCode());
+ goodsArea1.setDistrictsCode(goodsArea.getDistrictsCode());
+ goodsArea1.setProvince(goodsArea.getProvince());
+ goodsArea1.setCity(goodsArea.getCity());
+ goodsArea1.setDistricts(goodsArea.getDistricts());
+ goodsArea1.setGoodsAreaList(goodsAreas);
+ goodsAreaList1.add(goodsArea1);
});
goods.setGoodsAreaList(goodsAreaList1);
--
Gitblit v1.7.1