From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java | 193 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 136 insertions(+), 57 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..a7bdf76 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
@@ -21,14 +21,19 @@
import com.ruoyi.other.service.*;
import com.ruoyi.other.vo.GoodsVO;
import com.ruoyi.system.api.model.LoginUser;
+import org.jetbrains.annotations.NotNull;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* <p>
@@ -80,7 +85,7 @@
goodsVO.setGoodsId(goods.getId());
goodsVO.setGoodsName(goods.getName());
R<Price> r = remoteOrderGoodsClient.getGoodsPrice(loginUserApplet.getUserid(), goods.getId(), null);
- if (R.isSuccess(r)){
+ if (null != r.getData()){
Price price = r.getData();
goodsVO.setSellingPrice(price.getCash());
goodsVO.setIntegral(price.getPoint());
@@ -98,8 +103,8 @@
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
AppUser appUser = appUserClient.getAppUserById(loginUserApplet.getUserid());
- BigDecimal sellingPrice;
- Integer integral;
+ BigDecimal sellingPrice = BigDecimal.ZERO;
+ Integer integral = 0;
GoodsArea goodsArea = goodsAreaMapper.selectOne(new LambdaQueryWrapper<GoodsArea>()
.eq(GoodsArea::getGoodsId, goodsId)
@@ -115,9 +120,10 @@
GoodsVip goodsVip = goodsVipService.getOne(new LambdaQueryWrapper<GoodsVip>()
.eq(GoodsVip::getVip, vipSetting.getId())
.eq(GoodsVip::getGoodsId, goodsId));
-
- sellingPrice = goodsVip.getSellingPrice();
- integral = goodsVip.getIntegral();
+ if(null != goodsVip){
+ sellingPrice = goodsVip.getSellingPrice();
+ integral = goodsVip.getIntegral();
+ }
}
Goods goods = this.getById(goodsId);
@@ -167,38 +173,56 @@
if (CollectionUtils.isEmpty(goodsShopList)){
throw new NullPointerException("请选择指定门店");
}
- for (GoodsShop goodsShop : goodsShopList) {
- goodsShop.setGoodsId(goods.getId());
- goodsShop.setId(null);
- }
- goodsShopService.saveBatch(goodsShopList);
+ saveGoodsShopList(goodsShopList, goods.getId());
}
// 指定用户
List<GoodsAppUser> goodsAppUserList = goods.getGoodsAppUserList();
if (!CollectionUtils.isEmpty(goodsAppUserList)){
- for (GoodsAppUser goodsAppUser : goodsAppUserList) {
- goodsAppUser.setId(null );
- goodsAppUser.setGoodsId(goods.getId());
- }
- goodsAppUserService.saveBatch(goodsAppUserList);
+ saveGoodsAppUserList(goodsAppUserList, goods.getId());
}
// 会员价格配置
List<GoodsVip> goodsVipList = goods.getGoodsVipList();
- for (GoodsVip goodsVip : goodsVipList) {
- goodsVip.setId(null);
- goodsVip.setGoodsId(goods.getId());
- }
- goodsVipService.saveBatch(goodsVipList);
+ saveGoodsVipList(goodsVipList, goods.getId());
// 特殊地区售价设置
List<GoodsArea> goodsAreaList = goods.getGoodsAreaList();
if (!CollectionUtils.isEmpty(goodsAreaList)){
+ saveGoodsAreaList(goodsAreaList, goods.getId());
+ }
+
+ }
+
+ @Override
+ public void updateManageGoods(Goods goods) {
+ goodsMapper.updateById(goods);
+ // 指定门店
+ List<GoodsShop> goodsShopList = goods.getGoodsShopList();
+ saveGoodsShopList(goodsShopList, goods.getId());
+
+ // 指定用户
+ List<GoodsAppUser> goodsAppUserList = goods.getGoodsAppUserList();
+ saveGoodsAppUserList(goodsAppUserList, goods.getId());
+
+ // 会员价格配置
+ List<GoodsVip> goodsVipList = goods.getGoodsVipList();
+ saveGoodsVipList(goodsVipList, goods.getId());
+
+ // 特殊地区售价设置
+ List<GoodsArea> goodsAreaList = goods.getGoodsAreaList();
+ saveGoodsAreaList(goodsAreaList, goods.getId());
+ }
+
+ private void saveGoodsAreaList(List<GoodsArea> goodsAreaList, Integer id) {
+ goodsAreaService.remove(new LambdaQueryWrapper<GoodsArea>()
+ .eq(GoodsArea::getGoodsId, id));
+ if (!CollectionUtils.isEmpty(goodsAreaList)){
for (GoodsArea goodsArea : goodsAreaList) {
List<GoodsArea> goodsAreaList1 = goodsArea.getGoodsAreaList();
for (GoodsArea area : goodsAreaList1) {
- area.setGoodsId(goods.getId());
+ area.setId(null);
+ area.setGoodsId(id);
area.setProvince(goodsArea.getProvince());
area.setCity(goodsArea.getCity());
area.setDistricts(goodsArea.getDistricts());
@@ -209,60 +233,88 @@
goodsAreaService.saveBatch(goodsAreaList1);
}
}
-
}
- @Override
- public void updateManageGoods(Goods goods) {
- goodsMapper.updateById(goods);
- // 指定门店
- List<GoodsShop> goodsShopList = goods.getGoodsShopList();
- goodsShopService.updateBatchById(goodsShopList);
+ private void saveGoodsVipList(List<GoodsVip> goodsVipList, Integer id) {
+ goodsVipService.remove(new LambdaQueryWrapper<GoodsVip>()
+ .eq(GoodsVip::getGoodsId, id));
+ goodsVipList.forEach(item -> {
+ item.setId(null);
+ item.setGoodsId(id);
+ });
+ goodsVipService.saveBatch(goodsVipList);
+ }
- // 指定用户
- List<GoodsAppUser> goodsAppUserList = goods.getGoodsAppUserList();
- goodsAppUserService.updateBatchById(goodsAppUserList);
-
- // 会员价格配置
- List<GoodsVip> goodsVipList = goods.getGoodsVipList();
- goodsVipService.updateBatchById(goodsVipList);
-
- // 特殊地区售价设置
- List<GoodsArea> goodsAreaList = goods.getGoodsAreaList();
- if (!CollectionUtils.isEmpty(goodsAreaList)){
- 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);
+ private void saveGoodsAppUserList(List<GoodsAppUser> goodsAppUserList, Integer id) {
+ goodsAppUserService.remove(new LambdaQueryWrapper<GoodsAppUser>()
+ .eq(GoodsAppUser::getGoodsId, id));
+ if (!CollectionUtils.isEmpty(goodsAppUserList)){
+ for (GoodsAppUser goodsAppUser : goodsAppUserList) {
+ goodsAppUser.setId(null );
+ goodsAppUser.setGoodsId(id);
}
}
+ goodsAppUserService.saveBatch(goodsAppUserList);
+ }
+
+ private void saveGoodsShopList(List<GoodsShop> goodsShopList, Integer goodsId) {
+ goodsShopService.remove(new LambdaQueryWrapper<GoodsShop>()
+ .eq(GoodsShop::getGoodsId, goodsId));
+ if (!CollectionUtils.isEmpty(goodsShopList)){
+ for (GoodsShop goodsShop : goodsShopList) {
+ goodsShop.setGoodsId(goodsId);
+ goodsShop.setId(null);
+ }
+ }
+ goodsShopService.saveBatch(goodsShopList);
}
@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());
+ if (vipSetting != null){
+ goodsAppUser.setVipName(vipSetting.getVipName());
+ goodsAppUser.setVipId(u.getVipId());
+ }
+ });
+ }
+
goods.setGoodsAppUserList(goodsAppUserList);
// 会员价格
List<GoodsVip> goodsVipList = goodsVipService.list(new LambdaQueryWrapper<GoodsVip>()
.eq(GoodsVip::getGoodsId, goodsId));
+ List<VipSetting> vipSettings = getVipSettings(goodsVipList.stream().map(GoodsVip::getVip));
+ goodsVipList.forEach(goodsArea -> vipSettings.stream()
+ .filter(vipSetting -> vipSetting.getId().equals(goodsArea.getVip()))
+ .findFirst().ifPresent( vipSetting -> goodsArea.setVipName(vipSetting.getVipName())));
+
goods.setGoodsVipList(goodsVipList);
// 特殊地区售价设置
@@ -275,12 +327,39 @@
List<GoodsArea> goodsAreaList1 = new ArrayList<>();
listMap.forEach((s, goodsAreas) -> {
- GoodsArea goodsArea = goodsAreas.get(0);
- goodsArea.setGoodsAreaList(goodsAreas);
- goodsAreaList1.add(goodsArea);
+
+ List<VipSetting> vipSettings1 = getVipSettings(goodsAreas.stream().map(GoodsArea::getVip));
+ goodsAreas.forEach(goodsArea -> vipSettings1.stream()
+ .filter(vipSetting -> vipSetting.getId().equals(goodsArea.getVip()))
+ .findFirst().ifPresent( vipSetting -> goodsArea.setVipName(vipSetting.getVipName())));
+
+ GoodsArea goodsArea1 = getGoodsArea(goodsAreas);
+ goodsAreaList1.add(goodsArea1);
});
goods.setGoodsAreaList(goodsAreaList1);
return goods;
}
+
+ private List<VipSetting> getVipSettings(Stream<Integer> goodsVipList) {
+ List<Integer> vipIds = goodsVipList.collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(vipIds)){
+ return new ArrayList<>();
+ }
+ return vipSettingService.listByIds(vipIds);
+ }
+
+ @NotNull
+ private static GoodsArea getGoodsArea(List<GoodsArea> goodsAreas) {
+ GoodsArea goodsArea = goodsAreas.get(0);
+ 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);
+ return goodsArea1;
+ }
}
--
Gitblit v1.7.1