From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java |  638 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 635 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java
index 565f595..a279095 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java
@@ -1,10 +1,69 @@
 package com.ruoyi.goods.service.impl;
 
-import com.ruoyi.goods.domain.pojo.GoodsSku;
-import com.ruoyi.goods.mapper.GoodsSkuMapper;
-import com.ruoyi.goods.service.IGoodsSkuService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.ruoyi.common.core.constant.SecurityConstants;
+import com.ruoyi.common.core.enums.ListingStatusEnum;
+import com.ruoyi.common.core.enums.StartStatusEnum;
+import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.page.BeanUtils;
+import com.ruoyi.common.core.utils.page.Checker;
+import com.ruoyi.common.core.utils.page.CollUtils;
+import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.goods.controller.management.dto.GoodsInfoTitleValueDTO;
+import com.ruoyi.goods.controller.management.dto.GoodsSkuDTO;
+import com.ruoyi.goods.controller.management.dto.GoodsSkuQuery;
+import com.ruoyi.goods.controller.management.vo.GoodsSkuVO;
+import com.ruoyi.goods.domain.GoodsBrowseRecord;
+import com.ruoyi.goods.domain.GoodsInfoTitleValue;
+import com.ruoyi.goods.domain.MemberGoodsCollection;
+import com.ruoyi.goods.mapper.GoodsGroupPurchaseMapper;
+import com.ruoyi.goods.mapper.GoodsSeckillMapper;
+import com.ruoyi.goods.mapper.GoodsSkuMapper;
+import com.ruoyi.goods.service.IGoodsBrowseRecordService;
+import com.ruoyi.goods.service.IGoodsInfoTitleValueService;
+import com.ruoyi.goods.service.IGoodsSkuService;
+import com.ruoyi.goods.service.IMemberGoodsCollectionService;
+import com.ruoyi.system.api.domain.GoodsBrand;
+import com.ruoyi.system.api.domain.GoodsCategory;
+import com.ruoyi.system.api.domain.GoodsFlavorType;
+import com.ruoyi.system.api.domain.GoodsGroupPurchase;
+import com.ruoyi.system.api.domain.GoodsSeckill;
+import com.ruoyi.system.api.domain.GoodsSeries;
+import com.ruoyi.system.api.domain.GoodsSku;
+import com.ruoyi.system.api.domain.Order;
+import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO;
+import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;
+import com.ruoyi.system.api.domain.dto.ListStatusDTO;
+import com.ruoyi.system.api.domain.vo.GoodsInfoTitleValueVO;
+import com.ruoyi.system.api.domain.vo.HomeGoodsSkuInfoVO;
+import com.ruoyi.system.api.domain.vo.HomeGoodsSkuListVO;
+import com.ruoyi.system.api.domain.vo.getHomeGoodsSkuXxiVO;
+import com.ruoyi.system.api.feignClient.GoodsSkuClient;
+import com.ruoyi.system.api.feignClient.OrderClient;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import javax.annotation.Resource;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * <p>
@@ -15,6 +74,579 @@
  * @since 2024-05-16
  */
 @Service
+@Slf4j
+@RequiredArgsConstructor
 public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> implements IGoodsSkuService {
 
+    private final IGoodsInfoTitleValueService goodsInfoTitleValueService;
+    private final GoodsSeckillMapper goodsSeckillMapper;
+    private final GoodsGroupPurchaseMapper goodsGroupPurchaseMapper;
+    private final RedissonClient redissonClient;
+
+    @Resource
+    private IGoodsBrowseRecordService iGoodsBrowseRecordService;
+
+
+    @Resource
+    private OrderClient orderClient;
+
+    @Resource
+    private  GoodsSkuClient goodsSkuClient;
+
+    @Resource
+    private IMemberGoodsCollectionService iMemberGoodsCollectionService;
+
+
+    private static final ObjectMapper objectMapper = new ObjectMapper();
+
+    /**
+     * 保存商品SKU信息。
+     *
+     * @param dto 商品SKU的DTO(数据传输对象),包含要保存或更新的商品SKU的详细信息。
+     * @throws JsonProcessingException 当处理JSON数据时发生错误。
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveGoods(GoodsSkuDTO dto) throws JsonProcessingException {
+        // 使用BeanUtils将DTO对象复制到GoodsSku实体对象
+        GoodsSku goodsSku = BeanUtils.copyBean(dto, GoodsSku.class);
+
+        // 分割并处理专辑图片字符串,将其转换为JSON格式
+        String albumStr = processAlbumString(goodsSku.getAlbum());
+
+        goodsSku.setAlbum(albumStr);
+
+        // 根据ID判断是进行新增还是更新操作
+        if (Objects.isNull(dto.getId())) {
+            this.save(goodsSku);
+        } else {
+            GoodsSku goodsSkuOrg = this.getById(dto.getId());
+            if (StringUtils.isNull(goodsSkuOrg)) {
+                throw new ServiceException("商品不存在");
+            }
+            this.updateById(goodsSku);
+        }
+
+        // 处理商品额外信息,如规格、属性等
+        processGoodsInfoTitleValue(dto, goodsSku);
+    }
+
+    /**
+     * 处理相册字符串。 该方法将输入的相册字符串分割为字符串数组,并将其序列化为JSON字符串形式返回。 如果输入的相册字符串为空或仅包含空白字符,则返回空字符串。
+     *
+     * @param album 输入的相册字符串,可能包含多个相册名称,各相册名称之间以逗号分隔。
+     * @return 返回序列化后的相册名称数组的JSON字符串。如果输入为空,则返回空字符串。
+     * @throws JsonProcessingException 如果在序列化过程中发生错误,则抛出此异常。
+     */
+    private String processAlbumString(String album) throws JsonProcessingException {
+        if (StringUtils.isEmpty(album)) {
+            return ""; // 返回空字符串,避免后续处理出现问题
+        }
+        String[] albumArr = album.split(",");
+        return objectMapper.writeValueAsString(albumArr);
+    }
+
+    /**
+     * 处理商品信息标题和值的逻辑。 将DTO列表复制到实体列表中,校验其完整性和正确性,然后关联SKU ID,并最后保存到数据库。
+     *
+     * @param dto      包含商品信息标题和值的DTO对象
+     * @param goodsSku 商品SKU实体,用于关联商品额外信息
+     * @throws ServiceException 如果校验失败或数据处理出现异常,则抛出服务异常
+     */
+    private void processGoodsInfoTitleValue(GoodsSkuDTO dto, GoodsSku goodsSku)
+            throws ServiceException {
+        List<GoodsInfoTitleValueDTO> goodsInfoTitleValueDTOList = dto.getGoodsInfoTitleValueDTOList();
+
+        // 复制DTO列表到实体列表
+        List<GoodsInfoTitleValue> goodsInfoTitleValues = BeanUtils.copyList(
+                goodsInfoTitleValueDTOList, GoodsInfoTitleValue.class);
+
+        // 校验商品额外信息的完整性和正确性
+        CollUtils.check(goodsInfoTitleValues, new Checker<GoodsInfoTitleValue>() {
+            @Override
+            public void check(GoodsInfoTitleValue data) {
+                if (StringUtils.isNull(data.getGoodsInfoTitleId())) {
+                    throw new ServiceException("商品信息标题id不能为空");
+                }
+                if (StringUtils.isEmpty(data.getContent())) {
+                    throw new ServiceException("商品信息内容不能为空");
+                }
+            }
+        });
+
+        // 给每个商品额外信息关联上SKU ID
+        for (GoodsInfoTitleValue goodsInfoTitleValue : goodsInfoTitleValues) {
+            goodsInfoTitleValue.setGoodsSkuId(goodsSku.getId());
+        }
+
+        // 先清除旧的商品信息,再批量保存新的商品信息
+        goodsInfoTitleValueService.removeByGoodsSkuId(goodsSku.getId());
+        goodsInfoTitleValueService.saveBatch(goodsInfoTitleValues);
+    }
+
+    /**
+     * 获取商品SKU分页数据
+     *
+     * @param query 查询条件,包括SKU名称、上架状态、页码和页大小
+     * @return 分页数据对象,包含商品SKU的信息
+     */
+    @Override
+    public PageDTO<GoodsSkuVO> getGoodsPage(GoodsSkuQuery query) {
+        Page<GoodsSku> page = this.lambdaQuery()
+                .select(GoodsSku::getId, GoodsSku::getSkuName, GoodsSku::getPrice,
+                        GoodsSku::getStock, GoodsSku::getSoldQuantity, GoodsSku::getSortNum,
+                        GoodsSku::getListingStatus, GoodsSku::getUnit, GoodsSku::getSpec,
+                        GoodsSku::getSpecUnit)
+                .like(StringUtils.isNotEmpty(query.getSkuName()), GoodsSku::getSkuName,
+                        query.getSkuName())
+                .eq(StringUtils.isNotNull(query.getListingStatus()
+                ), GoodsSku::getListingStatus, query.getListingStatus())
+                .eq(query.getQueryType().equals(1), GoodsSku::getListingStatus,
+                        ListingStatusEnum.ON_SHELVES)
+                .gt(query.getQueryType().equals(1), GoodsSku::getStock, 0)
+                .orderByDesc(GoodsSku::getCreateTime)
+                .page(new Page<>(query.getPageCurr(), query.getPageSize()));
+        return PageDTO.of(page, GoodsSkuVO.class);
+    }
+
+    /**
+     * 更新商品SKU的状态。
+     *
+     * @param dto 数据传输对象,包含需要更新的SKU的ID和新的上架状态。 其中,ID用于指定要更新的具体SKU,listingStatus用于指定新的上架状态。
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
+    public void updStatus(ListStatusDTO dto) {
+        this.lambdaUpdate()
+                .eq(GoodsSku::getId, dto.getId())
+                .set(GoodsSku::getListingStatus, dto.getListingStatus())
+                .update();
+        //关联的秒杀商品和团购商品同步下架
+        if (dto.getListingStatus().equals(ListingStatusEnum.REMOVED_FROM_THE_SHELF)) {
+            updateGoodsStatus(dto);
+        }
+    }
+
+    private void updateGoodsStatus(ListStatusDTO dto) {
+        LambdaQueryWrapper<GoodsSeckill> queryWrapper =new LambdaQueryWrapper<>();
+        queryWrapper.eq(GoodsSeckill::getListingStatus, ListingStatusEnum.ON_SHELVES)
+                .eq(GoodsSeckill::getGoodsSkuId, dto.getId());
+        List<GoodsSeckill> goodsSeckillList = goodsSeckillMapper.selectList(queryWrapper);
+        if (StringUtils.isNotNull(goodsSeckillList)) {
+            goodsSeckillList = goodsSeckillList.stream().peek(goodsSeckill -> {
+                goodsSeckill.setListingStatus(ListingStatusEnum.REMOVED_FROM_THE_SHELF);
+            }).collect(Collectors.toList());
+            goodsSeckillMapper.updateListingStatusBatch(
+                    ListingStatusEnum.REMOVED_FROM_THE_SHELF.getCode(), goodsSeckillList);
+        }
+
+        LambdaQueryWrapper<GoodsGroupPurchase> queryWrapper1 =new LambdaQueryWrapper<>();
+        queryWrapper1.eq(GoodsGroupPurchase::getListingStatus,
+                        ListingStatusEnum.ON_SHELVES)
+                .eq(GoodsGroupPurchase::getGoodsSkuId, dto.getId());
+        List<GoodsGroupPurchase> goodsGroupPurchaseList = goodsGroupPurchaseMapper.selectList(
+                queryWrapper1);
+        if (CollUtils.isNotEmpty(goodsGroupPurchaseList)) {
+            goodsGroupPurchaseList = goodsGroupPurchaseList.stream().peek(goodsGroupPurchase -> {
+                goodsGroupPurchase.setListingStatus(ListingStatusEnum.REMOVED_FROM_THE_SHELF);
+            }).collect(Collectors.toList());
+            goodsGroupPurchaseMapper.updateListingStatusBatch(
+                    ListingStatusEnum.REMOVED_FROM_THE_SHELF.getCode(), goodsGroupPurchaseList);
+        }
+    }
+
+    /**
+     * 根据商品名称查询商品SKU列表。
+     *
+     * @param goodsSkuName 商品名称
+     * @return List<GoodsSku>商品SKU列表
+     */
+    @Override
+    public List<GoodsSku> getGoodsByName(String goodsSkuName) {
+        return this.lambdaQuery()
+                .like(StringUtils.isNotEmpty(goodsSkuName), GoodsSku::getSkuName, goodsSkuName)
+                .list();
+    }
+
+
+    /**
+     * 批量更新商品库存 auctionStock 负数则为减库存,正数为加库存
+     *
+     * @param goodsStockUpdDTOS 商品库存修改数据传输对象
+     */
+    @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    public void updGoodsStock(List<GoodsStockUpdDTO> goodsStockUpdDTOS) {
+        log.info("开始批量更新商品库存");
+        for (GoodsStockUpdDTO goodsStockUpdDTO : goodsStockUpdDTOS) {
+            updateGoodsStock(goodsStockUpdDTO.getGoodsSkuId(),
+                    goodsStockUpdDTO.getAuctionStock());
+        }
+        log.info("批量更新商品库存结束");
+    }
+
+
+    @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    public void updGoodsStock1(GoodsStockUpdDTO goodsStockUpdDTOS) {
+        GoodsSku goodsSkus = this.getById(goodsStockUpdDTOS.getGoodsSkuId());
+        goodsSkus.setStock(goodsStockUpdDTOS.getAuctionStock());
+        goodsSkus.setSoldQuantity(goodsStockUpdDTOS.getSoldQuantity());
+        this.updateById(goodsSkus);
+
+    }
+
+
+    @Override
+    public PageDTO<HomeGoodsSkuListVO> getHomeGoodsSkuVOList(HomeGoodsSkuDTO homeGoodsSkuDTO) {
+        Page<GoodsSku> page = new Page<>();
+        page.setSize(homeGoodsSkuDTO.getPageSize());
+        page.setCurrent(homeGoodsSkuDTO.getPageCurr());
+
+        LambdaQueryWrapper<GoodsSku> wrapper3= Wrappers.lambdaQuery();
+        wrapper3.eq(GoodsSku::getDelFlag,0);
+        wrapper3.eq(GoodsSku::getListingStatus,0);
+        // if(homeGoodsSkuDTO.getId()!=null){
+        //     List arr=new ArrayList<>();
+        //     arr.add(homeGoodsSkuDTO.getId());
+        //     wrapper3.notIn(GoodsSku::getId,arr);
+        // }
+        if (homeGoodsSkuDTO.getSkuName()!=null&&homeGoodsSkuDTO.getSkuName()!=""){
+            wrapper3.like(GoodsSku::getSkuName,homeGoodsSkuDTO.getSkuName());
+        }
+        if (homeGoodsSkuDTO.getGoodsSkuId()!=null){
+            List<Long> id=new ArrayList<>();
+            id.add(homeGoodsSkuDTO.getGoodsSkuId());
+            wrapper3.notIn(GoodsSku::getId,id);
+        }
+        if (homeGoodsSkuDTO.getBrandId()!=null){
+            wrapper3.eq(GoodsSku::getBrandId,homeGoodsSkuDTO.getBrandId());
+        }
+        if (homeGoodsSkuDTO.getCategoryId()!=null){
+            wrapper3.eq(GoodsSku::getCategoryId,homeGoodsSkuDTO.getCategoryId());
+        }
+
+        if (homeGoodsSkuDTO.getSeriesId()!=null){
+            wrapper3.eq(GoodsSku::getSeriesId,homeGoodsSkuDTO.getSeriesId());
+        }
+        if (homeGoodsSkuDTO.getFlavorTypeId()!=null){
+            wrapper3.eq(GoodsSku::getFlavorTypeId,homeGoodsSkuDTO.getFlavorTypeId());
+        }
+        if (homeGoodsSkuDTO.getSort()==2){
+            wrapper3.orderByAsc(GoodsSku::getPrice);
+        }
+        if (homeGoodsSkuDTO.getSort()==3){
+            wrapper3.orderByDesc(GoodsSku::getPrice);
+        }
+        if (homeGoodsSkuDTO.getSort()==4){
+            wrapper3.orderByAsc(GoodsSku::getSoldQuantity);
+        }
+        if (homeGoodsSkuDTO.getSort()==5){
+            wrapper3.orderByDesc(GoodsSku::getSoldQuantity);
+        }
+        if(homeGoodsSkuDTO.getYear()==2){
+            LocalDateTime now = LocalDateTime.now();
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+            LocalDateTime newTime7 = now.minusYears(30);
+            String formattedDate7 = newTime7.format(formatter);
+            LocalDateTime parseTime7 = LocalDate.parse(formattedDate7).atStartOfDay();
+            wrapper3.le(GoodsSku::getYears,parseTime7);
+        }
+        if(homeGoodsSkuDTO.getYear()==3){
+            LocalDateTime now = LocalDateTime.now();
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+            LocalDateTime newTime7 = now.minusYears(30);
+            String formattedDate7 = newTime7.format(formatter);
+            LocalDateTime parseTime7 = LocalDate.parse(formattedDate7).atStartOfDay();
+
+            LocalDateTime newTime15 = now.minusYears(15);
+            String formattedDate15 = newTime15.format(formatter);
+            LocalDateTime parseTime15= LocalDate.parse(formattedDate15).atStartOfDay();
+            wrapper3.le(GoodsSku::getYears, parseTime15)
+                    .gt(GoodsSku::getYears, parseTime7);
+        }
+
+        if(homeGoodsSkuDTO.getYear()==4){
+            LocalDateTime now = LocalDateTime.now();
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+            LocalDateTime newTime7 = now.minusYears(5);
+            String formattedDate7 = newTime7.format(formatter);
+            LocalDateTime parseTime7 = LocalDate.parse(formattedDate7).atStartOfDay();
+
+            LocalDateTime newTime15 = now.minusYears(15);
+            String formattedDate15 = newTime15.format(formatter);
+            LocalDateTime parseTime15= LocalDate.parse(formattedDate15).atStartOfDay();
+            wrapper3.le(GoodsSku::getYears, parseTime7)
+                    .gt(GoodsSku::getYears, parseTime15);
+        }
+
+        if(homeGoodsSkuDTO.getYear()==5){
+            LocalDateTime now = LocalDateTime.now();
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+            LocalDateTime newTime7 = now.minusYears(1);
+            String formattedDate7 = newTime7.format(formatter);
+            LocalDateTime parseTime7 = LocalDate.parse(formattedDate7).atStartOfDay();
+
+            LocalDateTime newTime15 = now.minusYears(5);
+            String formattedDate15 = newTime15.format(formatter);
+            LocalDateTime parseTime15= LocalDate.parse(formattedDate15).atStartOfDay();
+            wrapper3.le(GoodsSku::getYears, parseTime7)
+                    .ge(GoodsSku::getYears, parseTime15);
+        }
+        wrapper3.orderByDesc(GoodsSku::getCreateTime);
+        wrapper3.last(",IF(isnull(sort_num),1,0), sort_num DESC");
+
+
+        Page<GoodsSku> page1 = this.page(page, wrapper3);
+        PageDTO<HomeGoodsSkuListVO> articleCommentsVOPageDTO = PageDTO.of(page1, HomeGoodsSkuListVO.class);
+        return  articleCommentsVOPageDTO;
+
+    }
+
+    @Override
+    public HomeGoodsSkuInfoVO getHomeGoodsSkuInfo(HomeGoodsSkuDTO homeGoodsSkuDTO) {
+        GoodsSku byId = this.getById(homeGoodsSkuDTO.getGoodsSkuId());
+        HomeGoodsSkuInfoVO homeGoodsSkuInfoVO=new HomeGoodsSkuInfoVO();
+        homeGoodsSkuInfoVO.setId(byId.getId());
+        homeGoodsSkuInfoVO.setSkuName(byId.getSkuName());
+        homeGoodsSkuInfoVO.setYears(String.valueOf(byId.getYears().getYear()));
+        GoodsBrand data = goodsSkuClient.getBrandOne(byId.getBrandId(), SecurityConstants.INNER).getData();
+        GoodsCategory data1 = goodsSkuClient.getCategoryOne(byId.getCategoryId(), SecurityConstants.INNER).getData();
+        GoodsSeries data2 = goodsSkuClient.getSeriesOne(byId.getSeriesId(), SecurityConstants.INNER).getData();
+        GoodsFlavorType data3 = goodsSkuClient.getFlavorTypeOne(byId.getFlavorTypeId(), SecurityConstants.INNER).getData();
+        if (data!=null){
+            homeGoodsSkuInfoVO.setBrand(data.getBrandName());
+        }
+        if (data1!=null){
+        homeGoodsSkuInfoVO.setCategory(data1.getCategoryName());
+        }
+        if (data2!=null){
+        homeGoodsSkuInfoVO.setSeries(data2.getSeriesName());
+        }
+        if (data3!=null) {
+            homeGoodsSkuInfoVO.setFlavorType(data3.getFlavorTypeName());
+        }
+        homeGoodsSkuInfoVO.setPrice(byId.getPrice());
+        homeGoodsSkuInfoVO.setSoldQuantity(byId.getSoldQuantity());
+        homeGoodsSkuInfoVO.setUnit(byId.getUnit());
+        homeGoodsSkuInfoVO.setSpec(byId.getSpec());
+        homeGoodsSkuInfoVO.setSpecUnit(byId.getSpecUnit());
+        homeGoodsSkuInfoVO.setCoverPic(byId.getCoverPic());
+        homeGoodsSkuInfoVO.setAlbum(byId.getAlbum());
+        homeGoodsSkuInfoVO.setDescription(byId.getDescription());
+        homeGoodsSkuInfoVO.setStock(byId.getStock());
+        homeGoodsSkuInfoVO.setDetail(byId.getDetail());
+        homeGoodsSkuInfoVO.setShareTitle(byId.getShareTitle());
+        homeGoodsSkuInfoVO.setSharePic(byId.getSharePic());
+
+        LambdaQueryWrapper<GoodsGroupPurchase> queryWrapper1 =new LambdaQueryWrapper<>();
+        queryWrapper1.eq(GoodsGroupPurchase::getListingStatus,
+                        ListingStatusEnum.ON_SHELVES)
+                .eq(GoodsGroupPurchase::getGoodsSkuId, byId.getId())
+                .eq(GoodsGroupPurchase::getStartStatus,
+                        StartStatusEnum.STARTED);
+        GoodsGroupPurchase goodsGroupPurchase = goodsGroupPurchaseMapper.selectOne(queryWrapper1);
+        if(goodsGroupPurchase!=null){
+            HomeGoodsSkuDTO homeGoodsSkuDTO1 =new HomeGoodsSkuDTO();
+            homeGoodsSkuDTO1.setGoodsSkuId(goodsGroupPurchase.getId());
+            homeGoodsSkuDTO1.setMemberId(homeGoodsSkuDTO.getMemberId());
+            Order data4 = orderClient.getOrderByGroupPurchaseMemberId2(homeGoodsSkuDTO1, SecurityConstants.INNER).getData();
+            if (data4!=null){
+                homeGoodsSkuInfoVO.setIsGoodsGroupPurchase(2);
+            }else{
+                homeGoodsSkuInfoVO.setIsGoodsGroupPurchase(1);
+            }
+
+        }else{
+            homeGoodsSkuInfoVO.setIsGoodsGroupPurchase(1);
+        }
+
+
+        LambdaQueryWrapper<MemberGoodsCollection> wrapper3= Wrappers.lambdaQuery();
+        wrapper3.eq(MemberGoodsCollection::getDelFlag,0);
+        wrapper3.eq(MemberGoodsCollection::getMemberId,homeGoodsSkuDTO.getMemberId());
+        wrapper3.eq(MemberGoodsCollection::getTargetId,homeGoodsSkuDTO.getGoodsSkuId());
+        wrapper3.eq(MemberGoodsCollection::getType,1);
+        List<MemberGoodsCollection> list = iMemberGoodsCollectionService.list(wrapper3);
+        if (list.size()>0){
+            homeGoodsSkuInfoVO.setIsCollection(2);
+        }else{
+            homeGoodsSkuInfoVO.setIsCollection(1);
+        }
+        List list1=new ArrayList<>();
+        list1.add(0);
+        list1.add(1);
+        LambdaQueryWrapper<GoodsGroupPurchase> queryWrapper2 =new LambdaQueryWrapper<>();
+        queryWrapper2.eq(GoodsGroupPurchase::getListingStatus,
+                        ListingStatusEnum.ON_SHELVES)
+                .eq(GoodsGroupPurchase::getGoodsSkuId, byId.getId()).in(GoodsGroupPurchase::getStartStatus, list1);
+        GoodsGroupPurchase goodsGroupPurchase2 = goodsGroupPurchaseMapper.selectOne(queryWrapper2);
+        if (goodsGroupPurchase2!=null){
+            homeGoodsSkuInfoVO.setGroupPurchaseGoods(2);
+        }else{
+            homeGoodsSkuInfoVO.setGroupPurchaseGoods(1);
+        }
+        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime newTime7 = now.minusDays(7);
+
+        LambdaQueryWrapper<GoodsBrowseRecord> wrapper4=Wrappers.lambdaQuery();
+        wrapper4.eq(GoodsBrowseRecord::getDelFlag,0);
+        wrapper4.eq(GoodsBrowseRecord::getGoodsSkuId,homeGoodsSkuDTO.getGoodsSkuId());
+        wrapper4.eq(GoodsBrowseRecord::getMemberId,homeGoodsSkuDTO.getMemberId());
+        wrapper4.ge(GoodsBrowseRecord::getCreateTime, newTime7)
+                .le(GoodsBrowseRecord::getCreateTime,now );
+        List<GoodsBrowseRecord> list2 = iGoodsBrowseRecordService.list(wrapper4);
+        if (list2.size()==0){
+            GoodsBrowseRecord auctionBrowseRecord=new GoodsBrowseRecord();
+            auctionBrowseRecord.setMemberId(homeGoodsSkuDTO.getMemberId());
+            auctionBrowseRecord.setGoodsSkuId(homeGoodsSkuDTO.getGoodsSkuId());
+            iGoodsBrowseRecordService.save(auctionBrowseRecord);
+        }
+
+
+        return homeGoodsSkuInfoVO;
+    }
+
+    @Override
+    public List<getHomeGoodsSkuXxiVO> getHomeGoodsSkuXxi(HomeGoodsSkuDTO homeGoodsSkuDTO) {
+        List<getHomeGoodsSkuXxiVO> homeGoodsSkuXxiVOS=new ArrayList<>();
+        GoodsSku byId = this.getById(homeGoodsSkuDTO.getGoodsSkuId());
+        GoodsBrand data = goodsSkuClient.getBrandOne(byId.getBrandId(), SecurityConstants.INNER).getData();
+        GoodsCategory data1 = goodsSkuClient.getCategoryOne(byId.getCategoryId(), SecurityConstants.INNER).getData();
+        GoodsSeries data2 = goodsSkuClient.getSeriesOne(byId.getSeriesId(), SecurityConstants.INNER).getData();
+        GoodsFlavorType data3 = goodsSkuClient.getFlavorTypeOne(byId.getFlavorTypeId(), SecurityConstants.INNER).getData();
+
+
+        if (data1!=null){
+            getHomeGoodsSkuXxiVO getHomeGoodsSkuXxiVO1=new getHomeGoodsSkuXxiVO();
+            getHomeGoodsSkuXxiVO1.setContent(data1.getCategoryName());
+            getHomeGoodsSkuXxiVO1.setTitleName("分类");
+            homeGoodsSkuXxiVOS.add(getHomeGoodsSkuXxiVO1);
+        }
+
+        if (data2!=null){
+        getHomeGoodsSkuXxiVO getHomeGoodsSkuXxiVO2=new getHomeGoodsSkuXxiVO();
+        getHomeGoodsSkuXxiVO2.setContent(data2.getSeriesName());
+        getHomeGoodsSkuXxiVO2.setTitleName("系列");
+        homeGoodsSkuXxiVOS.add(getHomeGoodsSkuXxiVO2);
+        }
+        if (data!=null) {
+            getHomeGoodsSkuXxiVO getHomeGoodsSkuXxiVO = new getHomeGoodsSkuXxiVO();
+            getHomeGoodsSkuXxiVO.setContent(data.getBrandName());
+            getHomeGoodsSkuXxiVO.setTitleName("品牌");
+            homeGoodsSkuXxiVOS.add(getHomeGoodsSkuXxiVO);
+        }
+        if (data3!=null) {
+            getHomeGoodsSkuXxiVO getHomeGoodsSkuXxiVO3 = new getHomeGoodsSkuXxiVO();
+            getHomeGoodsSkuXxiVO3.setContent(data3.getFlavorTypeName());
+            getHomeGoodsSkuXxiVO3.setTitleName("香型");
+            homeGoodsSkuXxiVOS.add(getHomeGoodsSkuXxiVO3);
+        }
+
+        List<GoodsInfoTitleValueVO> goodsInfoTitleValueVOList = goodsInfoTitleValueService.listByGoodsId(homeGoodsSkuDTO.getGoodsSkuId());
+        List<getHomeGoodsSkuXxiVO> homeGoodsSkuXxiVOS1=new ArrayList<>();
+        for (int i=0;i<goodsInfoTitleValueVOList.size();i++){
+            getHomeGoodsSkuXxiVO getHomeGoodsSkuXxiVOs=new getHomeGoodsSkuXxiVO();
+            getHomeGoodsSkuXxiVOs.setContent(goodsInfoTitleValueVOList.get(i).getContent());
+            getHomeGoodsSkuXxiVOs.setTitleName(goodsInfoTitleValueVOList.get(i).getTitleName());
+            if (goodsInfoTitleValueVOList.get(i).getSortNum()!=null){
+                getHomeGoodsSkuXxiVOs.setNum(goodsInfoTitleValueVOList.get(i).getSortNum());
+            }else{
+                getHomeGoodsSkuXxiVOs.setNum(i+1);
+            }
+
+
+            homeGoodsSkuXxiVOS1.add(getHomeGoodsSkuXxiVOs);
+        }
+
+
+        homeGoodsSkuXxiVOS1.sort((o1, o2) -> Integer.compare(o2.getNum(),o1.getNum()));
+        homeGoodsSkuXxiVOS.addAll(homeGoodsSkuXxiVOS1);
+
+        return homeGoodsSkuXxiVOS;
+    }
+
+    @Override
+    public List<getHomeGoodsSkuXxiVO> getMsHomeGoodsSkuXxi(HomeGoodsSkuDTO homeGoodsSkuDTO) {
+        List<getHomeGoodsSkuXxiVO> homeGoodsSkuXxiVOS=new ArrayList<>();
+        GoodsSeckill goodsSeckill = goodsSeckillMapper.selectById(homeGoodsSkuDTO.getGoodsSkuId());
+        GoodsSku byId = this.getById(goodsSeckill.getGoodsSkuId());
+        GoodsBrand data = goodsSkuClient.getBrandOne(byId.getBrandId(), SecurityConstants.INNER).getData();
+        GoodsCategory data1 = goodsSkuClient.getCategoryOne(byId.getCategoryId(), SecurityConstants.INNER).getData();
+        GoodsSeries data2 = goodsSkuClient.getSeriesOne(byId.getSeriesId(), SecurityConstants.INNER).getData();
+        GoodsFlavorType data3 = goodsSkuClient.getFlavorTypeOne(byId.getFlavorTypeId(), SecurityConstants.INNER).getData();
+        if (data!=null){
+            getHomeGoodsSkuXxiVO getHomeGoodsSkuXxiVO1=new getHomeGoodsSkuXxiVO();
+            getHomeGoodsSkuXxiVO1.setContent(data1.getCategoryName());
+            getHomeGoodsSkuXxiVO1.setTitleName("分类");
+            homeGoodsSkuXxiVOS.add(getHomeGoodsSkuXxiVO1);
+        }
+
+        if (data2!=null) {
+            getHomeGoodsSkuXxiVO getHomeGoodsSkuXxiVO2 = new getHomeGoodsSkuXxiVO();
+            getHomeGoodsSkuXxiVO2.setContent(data2.getSeriesName());
+            getHomeGoodsSkuXxiVO2.setTitleName("系列");
+            homeGoodsSkuXxiVOS.add(getHomeGoodsSkuXxiVO2);
+        }
+        if (data!=null) {
+            getHomeGoodsSkuXxiVO getHomeGoodsSkuXxiVO = new getHomeGoodsSkuXxiVO();
+            getHomeGoodsSkuXxiVO.setContent(data.getBrandName());
+            getHomeGoodsSkuXxiVO.setTitleName("品牌");
+            homeGoodsSkuXxiVOS.add(getHomeGoodsSkuXxiVO);
+        }
+        if (data3!=null) {
+            getHomeGoodsSkuXxiVO getHomeGoodsSkuXxiVO3 = new getHomeGoodsSkuXxiVO();
+            getHomeGoodsSkuXxiVO3.setContent(data3.getFlavorTypeName());
+            getHomeGoodsSkuXxiVO3.setTitleName("香型");
+            homeGoodsSkuXxiVOS.add(getHomeGoodsSkuXxiVO3);
+        }
+
+        List<GoodsInfoTitleValueVO> goodsInfoTitleValueVOList = goodsInfoTitleValueService.listByGoodsId(homeGoodsSkuDTO.getGoodsSkuId());
+        Collections.sort(goodsInfoTitleValueVOList, Comparator.comparingInt(GoodsInfoTitleValueVO::getSortNum));
+        for (GoodsInfoTitleValueVO goodsInfoTitleValueVO:goodsInfoTitleValueVOList){
+            getHomeGoodsSkuXxiVO getHomeGoodsSkuXxiVOs=new getHomeGoodsSkuXxiVO();
+            getHomeGoodsSkuXxiVOs.setContent(goodsInfoTitleValueVO.getContent());
+            getHomeGoodsSkuXxiVOs.setTitleName(goodsInfoTitleValueVO.getTitleName());
+            homeGoodsSkuXxiVOS.add(getHomeGoodsSkuXxiVOs);
+        }
+
+
+        return homeGoodsSkuXxiVOS;
+    }
+
+    private void updateGoodsStock(Long goodsSkuId, Integer auctionStock) {
+        String goodsLock = "goods_lock:" + goodsSkuId;
+        RLock redissonLock = redissonClient.getLock(goodsLock);
+        try {
+            redissonLock.lock(30, TimeUnit.SECONDS);
+            // 加库存
+            if (auctionStock > 0) {
+                this.baseMapper.addGoodsStock(goodsSkuId, auctionStock);
+            } else {
+                // 减库存
+                this.baseMapper.subGoodsStock(goodsSkuId, auctionStock * -1);
+            }
+        } finally {
+            redissonLock.unlock();
+        }
+    }
+
+    /**
+     * 根据商品id查询信息标题列表
+     *
+     * @param id 商品id
+     * @return List<GoodsInfoTitleValueVO>
+     */
+    @Override
+    public GoodsSkuVO getGoodsDetail(Long id) {
+        GoodsSku goodsSku = this.getById(id);
+        if (StringUtils.isNull(goodsSku)) {
+            throw new ServiceException("商品不存在");
+        }
+        GoodsSkuVO goodsSkuVO = BeanUtils.copyBean(goodsSku, GoodsSkuVO.class);
+        List<GoodsInfoTitleValueVO> goodsInfoTitleValueVOList = goodsInfoTitleValueService.listByGoodsId(
+                id);
+        goodsSkuVO.setGoodsInfoTitleValueVOList(goodsInfoTitleValueVOList);
+        return goodsSkuVO;
+    }
 }

--
Gitblit v1.7.1