From 30ddf6570494f77a3dde98e5cd85c07cb340f51a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 25 十一月 2024 14:42:43 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 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 eb17457..aff730b 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,14 +1,27 @@
package com.ruoyi.other.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.other.mapper.GoodsMapper;
+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.other.api.domain.Goods;
+import com.ruoyi.other.enums.GoodsStatus;
+import com.ruoyi.other.mapper.GoodsMapper;
import com.ruoyi.other.service.GoodsService;
+import com.ruoyi.other.vo.GoodsVO;
+import feignClient.RemoteOrderGoodsClient;
+import model.OrderGood;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
- * 服务实现类
+ * 服务实现类
* </p>
*
* @author luodangjia
@@ -16,5 +29,34 @@
*/
@Service
public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements GoodsService {
+ @Resource
+ private RemoteOrderGoodsClient orderGoodsClient;
+ @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())
+ .like(StringUtils.isNotEmpty(search.getName()), Goods::getName, search.getName()));
+
+ List<GoodsVO> result = new ArrayList<>();
+ for (Goods goods : goodsList) {
+ GoodsVO goodsVO = new GoodsVO();
+ BeanUtils.copyBeanProp(goodsVO, goods);
+ result.add(goodsVO);
+ }
+ return result;
+ }
+
+ @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;
+ }
+ return new GoodsVO();
+ }
}
--
Gitblit v1.7.1