From af2e817df194923ff46d58de42e16d0a4e5f7bba Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 24 六月 2024 18:07:24 +0800
Subject: [PATCH] 用户端商品
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSeckillController.java | 2 +-
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java | 2 +-
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java | 7 +++++--
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java | 2 +-
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java | 16 +++++++++-------
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java | 11 ++++++++++-
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 8 +++++++-
7 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java
index 1b176ea..7313c39 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java
@@ -166,8 +166,11 @@
R<Member> membeOne = memberClient.getMembeOne(articleVO.getMemberId(),
SecurityConstants.INNER);
Member data = membeOne.getData();
- articleVO.setMemberNickname(data.getNickname());
- articleVO.setMemberAvatar(data.getAvatar());
+ if (data!=null){
+ articleVO.setMemberNickname(data.getNickname());
+ articleVO.setMemberAvatar(data.getAvatar());
+
+ }
LambdaQueryWrapper<MemberLike> wrapper1= Wrappers.lambdaQuery();
wrapper1.eq(MemberLike::getMemberId,articleDTO.getMemberId());
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 906c6da..d69ae1f 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
@@ -571,7 +571,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 {
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSeckillController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSeckillController.java
index 4835518..ae5179f 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSeckillController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSeckillController.java
@@ -40,7 +40,7 @@
@InnerAuth
@PutMapping("/updGoodsSeckill")
R<?> updGoodsSeckill(@RequestBody GoodsStockUpdDTO goodsStockUpdDTOS) {
- GoodsSeckill GoodsSeckillOne = goodsSeckillService.getById(goodsStockUpdDTOS);
+ GoodsSeckill GoodsSeckillOne = goodsSeckillService.getById(goodsStockUpdDTOS.getGoodsSkuId());
GoodsSeckillOne.setSeckillStock(goodsStockUpdDTOS.getAuctionStock());
goodsSeckillService.updateById(GoodsSeckillOne);
return R.ok();
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 368822b..ca40629 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
@@ -398,7 +398,7 @@
.collect(Collectors.toList());
Page<GoodsGroupPurchase> page = new Page<>(homeGoodsSkuDTO.getPageCurr(), homeGoodsSkuDTO.getPageSize());
LambdaQueryWrapper< GoodsGroupPurchase> wrapper= Wrappers.lambdaQuery();
- if (goodsSkuIdList!=null){
+ if (goodsSkuIdList.size()>0){
wrapper.in(GoodsGroupPurchase::getId,goodsSkuIdList);
}
wrapper.eq(GoodsGroupPurchase::getListingStatus,0);
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java
index 2ba2951..1afb34e 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java
@@ -381,10 +381,19 @@
GoodsCategory data1 = goodsSkuClient.getCategoryOne(data6.getCategoryId(), SecurityConstants.INNER).getData();
GoodsSeries data2 = goodsSkuClient.getSeriesOne(data6.getSeriesId(), SecurityConstants.INNER).getData();
GoodsFlavorType data3 = goodsSkuClient.getFlavorTypeOne(data6.getFlavorTypeId(), SecurityConstants.INNER).getData();
- homeGoodsSeckillInfoVO.setBrand(data.getBrandName());
+ if(data!=null){
+ homeGoodsSeckillInfoVO.setBrand(data.getBrandName());
+ }
+ if(data1!=null){
homeGoodsSeckillInfoVO.setCategory(data1.getCategoryName());
+ }
+ if(data2!=null){
homeGoodsSeckillInfoVO.setSeries(data2.getSeriesName());
+ }
+ if(data3!=null){
homeGoodsSeckillInfoVO.setFlavorType(data3.getFlavorTypeName());
+ }
+
homeGoodsSeckillInfoVO.setPrice(data6.getPrice());
homeGoodsSeckillInfoVO.setSoldQuantity(byId.getSoldQuantity());
homeGoodsSeckillInfoVO.setUnit(data6.getUnit());
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 15af511..d3a3065 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
@@ -452,12 +452,14 @@
homeGoodsSkuDTO1.setGoodsSkuId(goodsGroupPurchase.getId());
homeGoodsSkuDTO1.setMemberId(homeGoodsSkuDTO.getMemberId());
List<OrderVO> data4 = orderClient.getOrderByGroupPurchaseMemberList(homeGoodsSkuDTO1, SecurityConstants.INNER).getData();
- if (data4!=null){
+ if (data4.size()>0){
homeGoodsSkuInfoVO.setIsGoodsGroupPurchase(2);
}else{
homeGoodsSkuInfoVO.setIsGoodsGroupPurchase(1);
}
+ }else{
+ homeGoodsSkuInfoVO.setIsGoodsGroupPurchase(1);
}
@@ -472,16 +474,16 @@
}else{
homeGoodsSkuInfoVO.setIsCollection(1);
}
- HomeGoodsSkuDTO homeGoodsSkuDTO1 =new HomeGoodsSkuDTO();
- homeGoodsSkuDTO1.setGoodsSkuId(goodsGroupPurchase.getId());
- homeGoodsSkuDTO1.setMemberId(homeGoodsSkuDTO.getMemberId());
- List<OrderVO> data4 = orderClient.getOrderByGroupPurchaseMemberList(homeGoodsSkuDTO1, SecurityConstants.INNER).getData();
- if (data4!=null){
+ LambdaQueryWrapper<GoodsGroupPurchase> queryWrapper2 =new LambdaQueryWrapper<>();
+ queryWrapper2.eq(GoodsGroupPurchase::getListingStatus,
+ ListingStatusEnum.ON_SHELVES)
+ .eq(GoodsGroupPurchase::getGoodsSkuId, byId.getId());
+ GoodsGroupPurchase goodsGroupPurchase2 = goodsGroupPurchaseMapper.selectOne(queryWrapper2);
+ if (goodsGroupPurchase2!=null){
homeGoodsSkuInfoVO.setGroupPurchaseGoods(2);
}else{
homeGoodsSkuInfoVO.setGroupPurchaseGoods(1);
}
-
LocalDateTime now = LocalDateTime.now();
LocalDateTime newTime7 = now.minusDays(7);
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 3ca2dd1..73b55a0 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -455,7 +455,13 @@
memberOrderDTO1.setMemberId(order.getMemberId());
memberOrderDTO1.setGoodsSkuId(order.getGoodsSkuId());
Integer num=baseMapper.getSeckillMembers1(memberOrderDTO1);
- Integer num1=num+order.getGoodsQuantity();
+ Integer num1=0;
+ if (num!=null){
+ num1 =num+order.getGoodsQuantity();
+ }else{
+ num1=order.getGoodsQuantity();
+ }
+
GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();
if (data.getLimitNumber()<=num1){
--
Gitblit v1.7.1