From 131a0d2dfa1061811567deed40b1036204703b8d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 29 十一月 2024 14:02:27 +0800
Subject: [PATCH] 11.29

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java |   70 ++++++++++++++++++++++++++++++----
 1 files changed, 61 insertions(+), 9 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 b1de54c..4a4ff9d 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,17 +1,29 @@
 package com.ruoyi.other.service.impl;
 
+import cn.hutool.json.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.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.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.vo.GoodsVO;
+import com.ruoyi.system.api.model.LoginUser;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -28,12 +40,22 @@
 public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements GoodsService {
     @Resource
     private GoodsMapper goodsMapper;
+    @Resource
+    private TokenService tokenService;
+    @Resource
+    private VipSettingService vipSettingService;
+    @Resource
+    private GoodsAreaMapper goodsAreaMapper;
+    @Resource
+    private GoodsVipService goodsVipService;
+    @Resource
+    private AppUserClient appUserClient;
 
     @Override
     public List<GoodsVO> goodsList(Goods search) {
         List<Goods> goodsList = this.list(new LambdaQueryWrapper<Goods>()
                 .eq(Goods::getStatus, GoodsStatus.UP)
-                .eq(Objects.nonNull(search.getGoodsCategoryId()) ,Goods::getGoodsCategoryId, search.getGoodsCategoryId())
+                .eq(Objects.nonNull(search.getGoodsCategoryId()), Goods::getGoodsCategoryId, search.getGoodsCategoryId())
                 .like(StringUtils.isNotEmpty(search.getName()), Goods::getName, search.getName()));
 
         List<GoodsVO> result = new ArrayList<>();
@@ -47,18 +69,48 @@
 
     @Override
     public GoodsVO goodsDetail(Long goodsId) {
-        // TODO 根据会员等级展示价格
-        Goods goods = this.getById(goodsId);
-        if (Objects.nonNull(goods)){
-            GoodsVO goodsVO = new GoodsVO();
-            BeanUtils.copyBeanProp(goodsVO, goods);
-            return goodsVO;
+        if (goodsId == null || goodsId <= 0) {
+            throw new NullPointerException("商品ID不能为空");
         }
-        return new GoodsVO();
+
+        LoginUser loginUserApplet = tokenService.getLoginUserApplet();
+        AppUser appUser = appUserClient.getAppUserById(loginUserApplet.getUserid());
+        BigDecimal sellingPrice;
+        Integer integral;
+
+        GoodsArea goodsArea = goodsAreaMapper.selectOne(new LambdaQueryWrapper<GoodsArea>()
+                .eq(GoodsArea::getGoodsId, goodsId)
+                .eq(GoodsArea::getProvinceCode, appUser.getProvinceCode())
+                .eq(StringUtils.isNotEmpty(appUser.getCityCode()), GoodsArea::getCityCode, appUser.getCityCode())
+                .eq(StringUtils.isNotEmpty(appUser.getDistrictCode()), GoodsArea::getDistrictsCode, appUser.getDistrictCode()));
+
+        if (Objects.nonNull(goodsArea)){
+            sellingPrice = goodsArea.getSellingPrice();
+            integral = goodsArea.getIntegral();
+        }else {
+            VipSetting vipSetting = vipSettingService.getVipSettingByUserId(loginUserApplet.getUserid());
+            GoodsVip goodsVip = goodsVipService.getOne(new LambdaQueryWrapper<GoodsVip>()
+                    .eq(GoodsVip::getVip, vipSetting.getId())
+                    .eq(GoodsVip::getGoodsId, goodsId));
+
+            sellingPrice = goodsVip.getSellingPrice();
+            integral = goodsVip.getIntegral();
+        }
+
+        Goods goods = this.getById(goodsId);
+        GoodsVO goodsVO = new GoodsVO();
+        BeanUtils.copyBeanProp(goodsVO, goods);
+        goodsVO.setSellingPrice(sellingPrice);
+        goodsVO.setIntegral(integral);
+        return goodsVO;
     }
+
 
     @Override
     public List<Goods> getGoodsListByShopId(Integer shopId) {
-        return goodsMapper.selectListByShopId(shopId);
+        LoginUser loginUserApplet = tokenService.getLoginUserApplet();
+        VipSetting vipSetting = vipSettingService.getVipSettingByUserId(loginUserApplet.getUserid());
+        return goodsMapper.selectListByShopId(shopId, vipSetting.getId());
     }
+
 }

--
Gitblit v1.7.1