Pu Zhibing
2024-12-17 d53c16a12e612a95dc8f6fb248e3669cbc441eb4
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);
            }
@@ -276,7 +275,10 @@
                goodsAppUser.setUserName(u.getName());
                goodsAppUser.setPhone(u.getPhone());
                VipSetting vipSetting = vipSettingService.getById(u.getVipId());
                goodsAppUser.setVipName(vipSetting.getVipName());
                if (vipSetting != null){
                    goodsAppUser.setVipName(vipSetting.getVipName());
                    goodsAppUser.setVipId(u.getVipId());
                }
            });
        }
@@ -297,6 +299,13 @@
        List<GoodsArea> goodsAreaList1 = new ArrayList<>();
        listMap.forEach((s, goodsAreas) -> {
            List<Integer> vipIds = goodsAreas.stream().map(GoodsArea::getVip).collect(Collectors.toList());
            List<VipSetting> vipSettings = vipSettingService.listByIds(vipIds);
            goodsAreas.forEach(goodsArea -> vipSettings.stream()
                    .filter(vipSetting -> vipSetting.getId().equals(goodsArea.getVip()))
                    .findFirst().ifPresent( vipSetting -> goodsArea.setVipName(vipSetting.getVipName())));
            GoodsArea goodsArea = goodsAreas.get(0);
            GoodsArea goodsArea1 = new GoodsArea();
            goodsArea1.setProvinceCode(goodsArea.getProvinceCode());