From bd02bce2ce2c492862787e7c6590fbd4d9e714e7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 17 十二月 2024 11:42:12 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 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 211121b..ee7d503 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
@@ -167,17 +167,29 @@
if (CollectionUtils.isEmpty(goodsShopList)){
throw new NullPointerException("请选择指定门店");
}
+ for (GoodsShop goodsShop : goodsShopList) {
+ goodsShop.setGoodsId(goods.getId());
+ goodsShop.setId(null);
+ }
goodsShopService.saveBatch(goodsShopList);
}
// 指定用户
List<GoodsAppUser> goodsAppUserList = goods.getGoodsAppUserList();
if (!CollectionUtils.isEmpty(goodsAppUserList)){
+ for (GoodsAppUser goodsAppUser : goodsAppUserList) {
+ goodsAppUser.setId(null );
+ goodsAppUser.setGoodsId(goods.getId());
+ }
goodsAppUserService.saveBatch(goodsAppUserList);
}
// 会员价格配置
List<GoodsVip> goodsVipList = goods.getGoodsVipList();
+ for (GoodsVip goodsVip : goodsVipList) {
+ goodsVip.setId(null);
+ goodsVip.setGoodsId(goods.getId());
+ }
goodsVipService.saveBatch(goodsVipList);
// 特殊地区售价设置
@@ -186,6 +198,7 @@
for (GoodsArea goodsArea : goodsAreaList) {
List<GoodsArea> goodsAreaList1 = goodsArea.getGoodsAreaList();
for (GoodsArea area : goodsAreaList1) {
+ area.setGoodsId(goods.getId());
area.setProvince(goodsArea.getProvince());
area.setCity(goodsArea.getCity());
area.setDistricts(goodsArea.getDistricts());
@@ -220,12 +233,14 @@
for (GoodsArea goodsArea : goodsAreaList) {
List<GoodsArea> goodsAreaList1 = goodsArea.getGoodsAreaList();
for (GoodsArea area : goodsAreaList1) {
+ area.setGoodsId(goods.getId());
area.setProvince(goodsArea.getProvince());
area.setCity(goodsArea.getCity());
area.setDistricts(goodsArea.getDistricts());
area.setProvinceCode(goodsArea.getProvinceCode());
area.setCityCode(goodsArea.getCityCode());
area.setDistrictsCode(goodsArea.getDistrictsCode());
+ goodsAreaList1.add(area);
}
goodsAreaService.updateBatchById(goodsAreaList1);
}
@@ -235,14 +250,36 @@
@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));
+ List<Long> userIds = goodsAppUserList.stream().map(GoodsAppUser::getAppUserId).collect(Collectors.toList());
+ List<AppUser> appUsers = appUserClient.listByIds(userIds);
+ for (GoodsAppUser goodsAppUser : goodsAppUserList) {
+ 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);
// 会员价格
@@ -261,8 +298,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