合并代码

puzhibing

2024-12-17 bd02bce2ce2c492862787e7c6590fbd4d9e714e7

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java

@@ -205,7 +205,6 @@
                    area.setProvinceCode(goodsArea.getProvinceCode());
                    area.setCityCode(goodsArea.getCityCode());
                    area.setDistrictsCode(goodsArea.getDistrictsCode());
                    goodsAreaList1.add(area);
                }
                goodsAreaService.saveBatch(goodsAreaList1);
            }
@@ -270,12 +269,15 @@
        // 指定用户
        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());
                goodsAppUser.setVipName(vipSetting.getVipName());
            });
        }

        goods.setGoodsAppUserList(goodsAppUserList);