From 8aa510ea43af4f4e36f226900ff653e78731688f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 17 十二月 2024 11:29:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 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 b057bef..9bad400 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
@@ -250,14 +250,33 @@
@Override
public Goods getManageGoodsDetail(Long goodsId) {
Goods goods = getById(goodsId);
+ if (goods == null){
+ return null;
+ }
// 指定门店
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);
// 指定用户
List<GoodsAppUser> goodsAppUserList = goodsAppUserService.list(new LambdaQueryWrapper<GoodsAppUser>()
.eq(GoodsAppUser::getGoodsId, goodsId));
+ for (GoodsAppUser goodsAppUser : goodsAppUserList) {
+ AppUser appUser = appUserClient.getAppUserById(goodsAppUser.getAppUserId());
+ goodsAppUser.setUserName(appUser.getName());
+ goodsAppUser.setPhone(appUser.getPhone());
+ VipSetting vipSetting = vipSettingService.getById(appUser.getVipId());
+ goodsAppUser.setVipName(vipSetting.getVipName());
+ }
+
goods.setGoodsAppUserList(goodsAppUserList);
// 会员价格
@@ -276,8 +295,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