From b55ac90eefc5bffa48abe54efcd5b4dc62d73c42 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 17 十二月 2024 15:01:59 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 9bad400..0633ad3 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
@@ -240,7 +240,6 @@
area.setProvinceCode(goodsArea.getProvinceCode());
area.setCityCode(goodsArea.getCityCode());
area.setDistrictsCode(goodsArea.getDistrictsCode());
- goodsAreaList1.add(area);
}
goodsAreaService.updateBatchById(goodsAreaList1);
}
@@ -269,12 +268,18 @@
// 指定用户
List<GoodsAppUser> goodsAppUserList = goodsAppUserService.list(new LambdaQueryWrapper<GoodsAppUser>()
.eq(GoodsAppUser::getGoodsId, goodsId));
+ List<Long> userIds = goodsAppUserList.stream().map(GoodsAppUser::getAppUserId).collect(Collectors.toList());
+ List<AppUser> appUsers = appUserClient.listByIds(userIds);
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());
+ appUsers.stream().filter(u -> u.getId().equals(goodsAppUser.getAppUserId())).findFirst().ifPresent( u -> {
+ goodsAppUser.setUserName(u.getName());
+ goodsAppUser.setPhone(u.getPhone());
+ VipSetting vipSetting = vipSettingService.getById(u.getVipId());
+ if (vipSetting != null){
+ goodsAppUser.setVipName(vipSetting.getVipName());
+ goodsAppUser.setVipId(u.getVipId());
+ }
+ });
}
goods.setGoodsAppUserList(goodsAppUserList);
--
Gitblit v1.7.1