From e2dca5a3ce717a7708d432955d3dc8d6ee800e5d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 19:12:16 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 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 a45c0d6..11aedc6 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
@@ -85,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());
@@ -103,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)
@@ -120,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);
@@ -133,14 +134,19 @@
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());
+ if(goods.getAppointStore() == 2){
List<Shop> shopList = shopMapper.selectList(new LambdaQueryWrapper<Shop>()
- .in(Shop::getId, shopIds));
-
+ .in(Shop::getDelFlag, 0));
goodsVO.setShopList(shopList);
+ }else{
+ 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;
}
@@ -220,6 +226,7 @@
for (GoodsArea goodsArea : goodsAreaList) {
List<GoodsArea> goodsAreaList1 = goodsArea.getGoodsAreaList();
for (GoodsArea area : goodsAreaList1) {
+ area.setId(null);
area.setGoodsId(id);
area.setProvince(goodsArea.getProvince());
area.setCity(goodsArea.getCity());
--
Gitblit v1.7.1