From b3526a4d0113bca15728f904322a6b501fa7b467 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期三, 24 七月 2024 19:15:55 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsGroupPurchaseController.java | 6 ++++++
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrowseRecordServiceImpl.java | 18 ++++++++----------
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java | 7 +++----
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java | 12 +++---------
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillAppointmentServiceImpl.java | 2 +-
5 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsGroupPurchaseController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsGroupPurchaseController.java
index 5def470..39cee12 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsGroupPurchaseController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsGroupPurchaseController.java
@@ -4,12 +4,14 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.fasterxml.jackson.core.JsonProcessingException;
+import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.system.api.domain.GoodsGroupPurchaseInfo;
import com.ruoyi.goods.service.impl.GoodsGroupPurchaseInfoServiceImpl;
import com.ruoyi.system.api.domain.GoodsGroupPurchase;
import com.ruoyi.goods.service.IGoodsGroupPurchaseService;
+import com.ruoyi.system.api.feignClient.OrderClient;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -31,6 +33,8 @@
private final IGoodsGroupPurchaseService goodsGroupPurchaseService;
private final GoodsGroupPurchaseInfoServiceImpl goodsGroupPurchaseInfoServiceImpl;
+
+ private final OrderClient orderClient;
@InnerAuth
@PostMapping("/getGoodsSeckiGoodsGroupPurchaseOne")
@@ -85,6 +89,7 @@
byId.setCurrentNumber(num);
if (num==byId.getGroupSize()){
byId.setGroupStatus(1);
+ orderClient.updateOrderStatusByMubres1(byId.getMubre(), SecurityConstants.INNER);
}
goodsGroupPurchaseInfoServiceImpl.updateById(byId);
}else{
@@ -94,6 +99,7 @@
return R.ok();
}
+
/**
* 团购商品开始团购
*
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrowseRecordServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrowseRecordServiceImpl.java
index f180139..e191799 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrowseRecordServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrowseRecordServiceImpl.java
@@ -15,6 +15,7 @@
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.dto.AuctionCollectionDTO;
import com.ruoyi.system.api.domain.vo.HomeGoodsSkuListVO;
+import com.ruoyi.system.api.domain.vo.WdMemberAuctionSalesroomVO;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import org.springframework.stereotype.Service;
@@ -52,7 +53,7 @@
.collect(Collectors.toSet());
}
- Page<HomeGoodsSkuListVO> page = new Page<>();
+ Page<GoodsBrowseRecord> page = new Page<>();
page.setSize(auctionCollectionDTO.getPageSize());
page.setCurrent(auctionCollectionDTO.getPageCurr());
LambdaQueryWrapper<GoodsBrowseRecord> wrapper= Wrappers.lambdaQuery();
@@ -67,20 +68,17 @@
}
}
wrapper.orderByDesc(GoodsBrowseRecord::getCreateTime);
- List<GoodsBrowseRecord> list = this.list(wrapper);
-
- List<HomeGoodsSkuListVO> auctionGoodsVOS=new ArrayList<>();
- for (GoodsBrowseRecord auctionCollection:list){
- HomeGoodsSkuListVO auctionGoodsVO=new HomeGoodsSkuListVO();
- GoodsSku goodsSku = goodsSkuMapper.selectById(auctionCollection.getGoodsSkuId());
+ Page<GoodsBrowseRecord> page1 = this.page(page, wrapper);
+ PageDTO<HomeGoodsSkuListVO> wdMemberAuctionSalesroomVOPageDTO = PageDTO.of(page1, HomeGoodsSkuListVO.class);
+ List<HomeGoodsSkuListVO> list = wdMemberAuctionSalesroomVOPageDTO.getList();
+ for (HomeGoodsSkuListVO auctionGoodsVO:list){
+ GoodsSku goodsSku = goodsSkuMapper.selectById(auctionGoodsVO.getGoodsSkuId());
auctionGoodsVO.setId(goodsSku.getId());
auctionGoodsVO.setPrice(goodsSku.getPrice());
auctionGoodsVO.setCoverPic(goodsSku.getCoverPic());
auctionGoodsVO.setSkuName(goodsSku.getSkuName());
auctionGoodsVO.setSoldQuantity(goodsSku.getSoldQuantity());
- auctionGoodsVOS.add(auctionGoodsVO);
}
- page.setRecords(auctionGoodsVOS);
- return PageDTO.of(page);
+ return wdMemberAuctionSalesroomVOPageDTO;
}
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java
index 8361708..8b1d0d5 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java
@@ -389,7 +389,7 @@
goodsGroupPurchaseInfoVO.setGroupSize(one.getGroupSize());
goodsGroupPurchaseInfoVO.setLimitNumber(one.getLimitNumber());
- if (one.getGroupStatus().getCode()==2){
+ if (one.getGroupStatus().getCode()==0){
LambdaQueryWrapper<GoodsGroupPurchaseInfo> wrapper6= Wrappers.lambdaQuery();
wrapper6.eq(GoodsGroupPurchaseInfo::getDelFlag,0);
wrapper6.eq(GoodsGroupPurchaseInfo::getGroupStatus,0);
@@ -435,7 +435,7 @@
HomeGoodsSkuDTO homeGoodsSkuDTO1=new HomeGoodsSkuDTO();
homeGoodsSkuDTO1.setGoodsSkuId(one.getId());
homeGoodsSkuDTO1.setMemberId(homeGoodsSkuDTO.getMemberId());
- Order data = orderClient.getOrderByGroupPurchaseMemberId1(homeGoodsSkuDTO1, SecurityConstants.INNER).getData();
+ Order data = orderClient.getOrderByGroupPurchaseMemberId2(homeGoodsSkuDTO1, SecurityConstants.INNER).getData();
if (data!=null){
goodsGroupPurchaseInfoVO.setIsGoodsGroupPurchase(2);
goodsGroupPurchaseInfoVO.setOrder(data);
@@ -565,12 +565,11 @@
orderDTO.setOrderFrom(OrderFromEnum.GROUP_PURCHASE_ORDERS);
orderDTO.setGoodsSkuId(goodsGroupPurchaseeVO.getId());
orderDTO.setMemberId(homeGoodsSkuDTO.getMemberId());
- Order orderOne = orderClient.getOrderOne(orderDTO, SecurityConstants.INNER).getData();
+ Order orderOne = orderClient.getOrderOne2(orderDTO, SecurityConstants.INNER).getData();
if (orderOne!=null){
LambdaQueryWrapper<GoodsGroupPurchaseInfo> wrapper6= Wrappers.lambdaQuery();
wrapper6.eq(GoodsGroupPurchaseInfo::getDelFlag,0);
- wrapper6.eq(GoodsGroupPurchaseInfo::getGroupStatus,0);
wrapper6.eq(GoodsGroupPurchaseInfo::getGroupPurchaseId,goodsGroupPurchaseeVO.getId());
wrapper6.eq(GoodsGroupPurchaseInfo::getMubre,orderOne.getGroupNo());
GoodsGroupPurchaseInfo one1 = goodsGroupPurchaseInfoService.getOne(wrapper6);
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillAppointmentServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillAppointmentServiceImpl.java
index d17570c..bc5f212 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillAppointmentServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillAppointmentServiceImpl.java
@@ -56,7 +56,7 @@
DelayTaskEnum.AUTOMATIC_CANCEL.getCode() + "-" + byId.getId(),
byId.getStartTime().minusMinutes(30), duration.getSeconds(), TimeUnit.SECONDS);
}catch (Exception e){
- throw new ServiceException("即将开始已无法遇约");
+
}
GoodsSeckillAppointment goodsSeckillAppointment=new GoodsSeckillAppointment();
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 9f3b22c..8200015 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
@@ -29,13 +29,7 @@
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.*;
import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO;
import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;
import com.ruoyi.system.api.domain.dto.ListStatusDTO;
@@ -440,8 +434,8 @@
HomeGoodsSkuDTO homeGoodsSkuDTO1 =new HomeGoodsSkuDTO();
homeGoodsSkuDTO1.setGoodsSkuId(goodsGroupPurchase.getId());
homeGoodsSkuDTO1.setMemberId(homeGoodsSkuDTO.getMemberId());
- List<OrderVO> data4 = orderClient.getOrderByGroupPurchaseMemberList(homeGoodsSkuDTO1, SecurityConstants.INNER).getData();
- if (data4.size()>0){
+ Order data4 = orderClient.getOrderByGroupPurchaseMemberId2(homeGoodsSkuDTO1, SecurityConstants.INNER).getData();
+ if (data4!=null){
homeGoodsSkuInfoVO.setIsGoodsGroupPurchase(2);
}else{
homeGoodsSkuInfoVO.setIsGoodsGroupPurchase(1);
--
Gitblit v1.7.1