From 93004b6af39ba122c8cc74ed729ac7f44532b6e2 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 27 六月 2024 09:06:10 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
index 414b6c0..676db97 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
@@ -56,6 +56,8 @@
import com.ruoyi.system.api.domain.dto.RefundDTO;
import com.ruoyi.system.api.domain.vo.AuctionGoodsListVO;
import com.ruoyi.system.api.domain.vo.AuctionGoodsinfoVO;
+import com.ruoyi.system.api.domain.vo.GoodsInfoTitleValueVO;
+import com.ruoyi.system.api.domain.vo.getHomeGoodsSkuXxiVO;
import com.ruoyi.system.api.feignClient.AuctionClient;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import com.ruoyi.system.api.feignClient.MemberClient;
@@ -65,6 +67,8 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -216,6 +220,15 @@
if (goodsSku.getStock() + auctionGoodsOrg.getAuctionStock() < dto.getAuctionStock()) {
throw new ServiceException("商品库存不足");
}
+ if (!auctionGoodsOrg.getAuctionStock().equals(dto.getAuctionStock())) {
+ // 更新商品库存
+ GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
+ goodsStockUpdDTO.setGoodsSkuId(goodsSkuId);
+ goodsStockUpdDTO.setAuctionStock(
+ auctionGoodsOrg.getAuctionStock() - dto.getAuctionStock());
+ goodsSkuClient.updGoodsStock(Lists.newArrayList(goodsStockUpdDTO),
+ SecurityConstants.INNER);
+ }
auctionGoodsOrg.setStartingPrice(dto.getStartingPrice());
auctionGoodsOrg.setMinimumMarkupAmount(dto.getMinimumMarkupAmount());
auctionGoodsOrg.setStartTime(dto.getStartTime());
@@ -227,15 +240,8 @@
auctionGoodsOrg.setShareTitle(dto.getShareTitle());
auctionGoodsOrg.setSharePic(dto.getSharePic());
this.updateById(auctionGoodsOrg);
- // 更新商品库存
- GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
- goodsStockUpdDTO.setGoodsSkuId(goodsSkuId);
- goodsStockUpdDTO.setAuctionStock(
- auctionGoodsOrg.getAuctionStock() - dto.getAuctionStock());
- goodsSkuClient.updGoodsStock(Lists.newArrayList(goodsStockUpdDTO),
- SecurityConstants.INNER);
- auctionAsyncMethodService.auctionGoodsScheduleTask(Lists.newArrayList(auctionGoods));
}
+ auctionAsyncMethodService.auctionGoodsScheduleTask(Lists.newArrayList(auctionGoods));
}
/**
@@ -527,6 +533,7 @@
LambdaQueryWrapper<AuctionBrowseRecord> wrapper3=Wrappers.lambdaQuery();
wrapper3.eq(AuctionBrowseRecord::getDelFlag,0);
wrapper3.eq(AuctionBrowseRecord::getTargetId,auctionGoodsListDTO.getGoodsSkuId());
+ wrapper3.eq(AuctionBrowseRecord::getBrowseType,AuctionOrderTypeEnum.REGULAR_ITEMS);
wrapper3.eq(AuctionBrowseRecord::getMemberId,auctionGoodsListDTO.getMemberId());
wrapper3.ge(AuctionBrowseRecord::getCreateTime, newTime7)
.le(AuctionBrowseRecord::getCreateTime, now);
@@ -551,6 +558,19 @@
CustomConfig returnAddressUserName = sysUserClient.getconfig("MALL_ORDER_DESCRIPTION").getData();
auctionGoodsinfoVO.setExplain(returnAddressUserName.getConfigValue());
+
+
+ List<getHomeGoodsSkuXxiVO> homeGoodsSkuXxiVOS=new ArrayList<>();
+ List<GoodsInfoTitleValueVO> goodsInfoTitleValueVOList = goodsSkuClient.getlistByGoodsId(goodsSkuOne.getId(), SecurityConstants.INNER).getData();
+ 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);
+ }
+ auctionGoodsinfoVO.setXxiVOS(homeGoodsSkuXxiVOS);
+
return auctionGoodsinfoVO;
}
@@ -560,7 +580,7 @@
memberAuctionSalesroomDTO.setMemberId(auctionGoodsListDTO.getMemberId());
List<OrderAuctionBond> data = orderClient.getAuctionGoodsOrderAuctionBondList(auctionGoodsListDTO, SecurityConstants.INNER).getData();
Set<Long> goodsSkuIdList = null;
- if (data!=null){
+ if (data.size()>0){
goodsSkuIdList = data.stream().map(OrderAuctionBond::getAuctionSalesroomId)
.collect(Collectors.toSet());
}else {
@@ -629,7 +649,6 @@
.equals(AuctionStartStatusEnum.IN_AUCTION)) {
auctionGoods.setStartStatus(AuctionStartStatusEnum.ENDED);
this.updateById(auctionGoods);
- // TODO 退保证金
orderClient.returnBondByAuctionGoodsId(id, SecurityConstants.INNER);
Map<String, Object> map = new ConcurrentHashMap<>();
--
Gitblit v1.7.1