From f196447bcf0b1cdb910a47e1babad6f284c28bd2 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 18 十二月 2024 16:58:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java | 264 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 256 insertions(+), 8 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 373e980..a45c0d6 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
@@ -1,31 +1,39 @@
package com.ruoyi.other.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.other.api.domain.Goods;
-import com.ruoyi.other.api.domain.GoodsArea;
-import com.ruoyi.other.api.domain.GoodsVip;
-import com.ruoyi.other.api.domain.VipSetting;
+import com.ruoyi.order.feignClient.RemoteOrderGoodsClient;
+import com.ruoyi.order.vo.Price;
+import com.ruoyi.other.api.domain.*;
import com.ruoyi.other.enums.GoodsStatus;
import com.ruoyi.other.mapper.GoodsAreaMapper;
import com.ruoyi.other.mapper.GoodsMapper;
-import com.ruoyi.other.service.GoodsService;
-import com.ruoyi.other.service.GoodsVipService;
-import com.ruoyi.other.service.VipSettingService;
+import com.ruoyi.other.mapper.GoodsShopMapper;
+import com.ruoyi.other.mapper.ShopMapper;
+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.ArrayList;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* <p>
@@ -49,18 +57,39 @@
private GoodsVipService goodsVipService;
@Resource
private AppUserClient appUserClient;
+ @Resource
+ private GoodsShopMapper goodsShopMapper;
+ @Resource
+ private GoodsShopService goodsShopService;
+ @Resource
+ private GoodsAppUserService goodsAppUserService;
+ @Resource
+ private ShopMapper shopMapper;
+ @Resource
+ private GoodsAreaService goodsAreaService;
+ @Resource
+ private RemoteOrderGoodsClient remoteOrderGoodsClient;
@Override
public List<GoodsVO> goodsList(Goods search) {
List<Goods> goodsList = this.list(new LambdaQueryWrapper<Goods>()
- .eq(Goods::getStatus, GoodsStatus.UP)
+ .eq(Goods::getStatus, GoodsStatus.UP.getCode())
.eq(Objects.nonNull(search.getGoodsCategoryId()), Goods::getGoodsCategoryId, search.getGoodsCategoryId())
.like(StringUtils.isNotEmpty(search.getName()), Goods::getName, search.getName()));
List<GoodsVO> result = new ArrayList<>();
+ LoginUser loginUserApplet = tokenService.getLoginUserApplet();
for (Goods goods : goodsList) {
GoodsVO goodsVO = new GoodsVO();
BeanUtils.copyBeanProp(goodsVO, goods);
+ goodsVO.setGoodsId(goods.getId());
+ goodsVO.setGoodsName(goods.getName());
+ R<Price> r = remoteOrderGoodsClient.getGoodsPrice(loginUserApplet.getUserid(), goods.getId(), null);
+ if (R.isSuccess(r)){
+ Price price = r.getData();
+ goodsVO.setSellingPrice(price.getCash());
+ goodsVO.setIntegral(price.getPoint());
+ }
result.add(goodsVO);
}
return result;
@@ -99,8 +128,20 @@
Goods goods = this.getById(goodsId);
GoodsVO goodsVO = new GoodsVO();
BeanUtils.copyBeanProp(goodsVO, goods);
+ goodsVO.setGoodsId(goods.getId());
+ goodsVO.setGoodsName(goods.getName());
goodsVO.setSellingPrice(sellingPrice);
goodsVO.setIntegral(integral);
+
+ List<GoodsShop> goodsShopList = goodsShopMapper.selectList(new LambdaQueryWrapper<GoodsShop>()
+ .eq(GoodsShop::getGoodsId, goodsId));
+ if (!CollectionUtils.isEmpty(goodsShopList)){
+ List<Integer> shopIds = goodsShopList.stream().map(GoodsShop::getShopId).collect(Collectors.toList());
+ List<Shop> shopList = shopMapper.selectList(new LambdaQueryWrapper<Shop>()
+ .in(Shop::getId, shopIds));
+
+ goodsVO.setShopList(shopList);
+ }
return goodsVO;
}
@@ -112,4 +153,211 @@
return goodsMapper.selectListByShopId(shopId, vipSetting.getId());
}
+ @Override
+ public IPage<Goods> getManageGoodsList(Page<Goods> page, Goods goods) {
+ return goodsMapper.selectManageGoodsList(page, goods);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void addGoods(Goods goods) {
+ goods.setSaleNum(0);
+ goods.setStatus(GoodsStatus.DOWN.getCode());
+ goodsMapper.insert(goods);
+
+ // 指定门店
+ Integer appointStore = goods.getAppointStore();
+ if (appointStore == 1){
+ List<GoodsShop> goodsShopList = goods.getGoodsShopList();
+ if (CollectionUtils.isEmpty(goodsShopList)){
+ throw new NullPointerException("请选择指定门店");
+ }
+ saveGoodsShopList(goodsShopList, goods.getId());
+ }
+
+ // 指定用户
+ List<GoodsAppUser> goodsAppUserList = goods.getGoodsAppUserList();
+ if (!CollectionUtils.isEmpty(goodsAppUserList)){
+ saveGoodsAppUserList(goodsAppUserList, goods.getId());
+ }
+
+ // 会员价格配置
+ List<GoodsVip> goodsVipList = goods.getGoodsVipList();
+ 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(id);
+ area.setProvince(goodsArea.getProvince());
+ area.setCity(goodsArea.getCity());
+ area.setDistricts(goodsArea.getDistricts());
+ area.setProvinceCode(goodsArea.getProvinceCode());
+ area.setCityCode(goodsArea.getCityCode());
+ area.setDistrictsCode(goodsArea.getDistrictsCode());
+ }
+ goodsAreaService.saveBatch(goodsAreaList1);
+ }
+ }
+ }
+
+ 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);
+ }
+
+ 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);
+
+ // 特殊地区售价设置
+ List<GoodsArea> goodsAreaList = goodsAreaService.list(new LambdaQueryWrapper<GoodsArea>()
+ .eq(GoodsArea::getGoodsId, goodsId));
+
+ Map<String, List<GoodsArea>> listMap = goodsAreaList.stream()
+ .collect(Collectors.groupingBy(goodsArea ->
+ goodsArea.getProvinceCode() + goodsArea.getCityCode() + goodsArea.getDistrictsCode()));
+
+ List<GoodsArea> goodsAreaList1 = new ArrayList<>();
+ listMap.forEach((s, goodsAreas) -> {
+
+ 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