From 01d6fa48a0de7a21988e89f71721b6b85e53b517 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 06 三月 2025 16:33:53 +0800
Subject: [PATCH] 去掉资讯图片必填限制
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java | 111 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 72 insertions(+), 39 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
index bc4abbe..e13d1e1 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
@@ -7,8 +7,8 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Lists;
import com.ruoyi.auction.domain.AuctionBidRecord;
-import com.ruoyi.auction.domain.AuctionSalesroomGoods;
import com.ruoyi.auction.mapper.AuctionBidRecordMapper;
+import com.ruoyi.auction.mapper.AuctionBondJlMapper;
import com.ruoyi.auction.mapper.AuctionSalesroomGoodsMapper;
import com.ruoyi.auction.mapper.AuctionSalesroomMapper;
import com.ruoyi.auction.service.IAuctionBrowseRecordService;
@@ -24,13 +24,29 @@
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.system.api.constants.NotificationTypeConstant;
-import com.ruoyi.system.api.domain.*;
+import com.ruoyi.system.api.domain.AuctionBondJl;
+import com.ruoyi.system.api.domain.AuctionSalesroom;
+import com.ruoyi.system.api.domain.AuctionSalesroomGoods;
+import com.ruoyi.system.api.domain.CustomConfig;
+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.GoodsSeries;
+import com.ruoyi.system.api.domain.GoodsSku;
+import com.ruoyi.system.api.domain.Member;
+import com.ruoyi.system.api.domain.MemberAddress;
+import com.ruoyi.system.api.domain.Order;
import com.ruoyi.system.api.domain.dto.AuctionSalesroomDTO;
import com.ruoyi.system.api.domain.dto.AuctionSalesroomGoodsInfoDTO;
import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO;
import com.ruoyi.system.api.domain.dto.OrderAuctionBondDTO;
import com.ruoyi.system.api.domain.dto.OrderDTO;
-import com.ruoyi.system.api.domain.vo.*;
+import com.ruoyi.system.api.domain.vo.AuctionBidRecordVO;
+import com.ruoyi.system.api.domain.vo.AuctionSalesroomGoodsInfoVO;
+import com.ruoyi.system.api.domain.vo.AuctionSalesroomVO;
+import com.ruoyi.system.api.domain.vo.ForepartAuctionSalesroomGoodsVO;
+import com.ruoyi.system.api.domain.vo.GoodsInfoTitleValueVO;
+import com.ruoyi.system.api.domain.vo.getHomeGoodsSkuXxiVO;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import com.ruoyi.system.api.feignClient.MemberClient;
import com.ruoyi.system.api.feignClient.OrderClient;
@@ -38,7 +54,13 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
@@ -79,6 +101,10 @@
@Resource
private IAuctionSalesroomService iAuctionSalesroomService;
+
+ @Resource
+ private AuctionBondJlMapper auctionBondJlMapper;
+
private static final ObjectMapper objectMapper = new ObjectMapper();
@@ -107,7 +133,7 @@
wrapper1.eq(AuctionSalesroomGoods::getStatus,2);
wrapper1.eq(AuctionSalesroomGoods::getDelFlag,0);
wrapper1.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
- wrapper1.orderByDesc(AuctionSalesroomGoods::getSortNum);
+ wrapper1.orderByDesc(AuctionSalesroomGoods::getEndTime);
wrapper1.last("limit 1");
auctionSalesroomGoods = this.getOne(wrapper1);
if (auctionSalesroomGoods==null){
@@ -129,13 +155,17 @@
forepartAuctionSalesroomGoodsVO.setSalesroomStock(auctionSalesroomGoods.getSalesroomStock());
forepartAuctionSalesroomGoodsVO.setListingDuration(auctionSalesroomGoods.getListingDuration());
forepartAuctionSalesroomGoodsVO.setStartTime(auctionSalesroomGoods.getStartTime());
- forepartAuctionSalesroomGoodsVO.setCoverPic(goodsSku.getCoverPic());
+ forepartAuctionSalesroomGoodsVO.setCoverPic(goodsSku.getScreenCoverPic());
forepartAuctionSalesroomGoodsVO.setDescription(goodsSku.getDescription());
forepartAuctionSalesroomGoodsVO.setDetail(goodsSku.getDetail());
forepartAuctionSalesroomGoodsVO.setYears(String.valueOf(goodsSku.getYears().getYear()));
forepartAuctionSalesroomGoodsVO.setUnit(goodsSku.getUnit());
forepartAuctionSalesroomGoodsVO.setSpec(goodsSku.getSpec());
forepartAuctionSalesroomGoodsVO.setSpecUnit(goodsSku.getSpecUnit());
+ forepartAuctionSalesroomGoodsVO.setMinimumMarkupAmount(
+ auctionSalesroomGoods.getMinimumMarkupAmount());
+ forepartAuctionSalesroomGoodsVO.setGoodsDescription(
+ auctionSalesroomGoods.getDescription());
if (auctionSalesroomGoods.getStatus().getCode()==0 || auctionSalesroomGoods.getStatus().getCode()==2){
LambdaQueryWrapper<AuctionSalesroomGoods> wrapper1=Wrappers.lambdaQuery();
wrapper1.eq(AuctionSalesroomGoods::getDelFlag,0);
@@ -178,7 +208,7 @@
wrapper.eq(AuctionSalesroomGoods::getDelFlag,0);
wrapper.eq(AuctionSalesroomGoods::getBackupStatus,false);
wrapper.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
- wrapper.orderByAsc(AuctionSalesroomGoods::getSortNum);
+ wrapper.orderByDesc(AuctionSalesroomGoods::getSortNum);
List<AuctionSalesroomGoods> auctionSalesroomGoods = this.list(wrapper);
for (AuctionSalesroomGoods salesroomGoods:auctionSalesroomGoods){
ForepartAuctionSalesroomGoodsVO forepartAuctionSalesroomGoodsVO1=new ForepartAuctionSalesroomGoodsVO();
@@ -196,6 +226,7 @@
wrapper.eq(AuctionSalesroomGoods::getDelFlag,0);
wrapper.eq(AuctionSalesroomGoods::getBackupStatus,false);
wrapper.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
+ wrapper.orderByDesc(AuctionSalesroomGoods::getSortNum);
wrapper.last("limit 1");
AuctionSalesroomGoods auctionSalesroomGoods = this.getOne(wrapper);
ForepartAuctionSalesroomGoodsVO currentAuctionSalesroomGoods= new ForepartAuctionSalesroomGoodsVO();
@@ -210,41 +241,19 @@
currentAuctionSalesroomGoods.setGoodsSkustatus(auctionSalesroomGoods.getStatus().getCode());
currentAuctionSalesroomGoods.setListingDuration(auctionSalesroomGoods.getListingDuration());
auctionSalesroomVO.setCurrentAuctionSalesroomGoods(currentAuctionSalesroomGoods);
- list.add(auctionSalesroomGoods.getSortNum());
+ list.add(auctionSalesroomGoods.getId());
}
LambdaQueryWrapper<AuctionSalesroomGoods> wrapper1=Wrappers.lambdaQuery();
wrapper1.eq(AuctionSalesroomGoods::getDelFlag,0);
wrapper1.eq(AuctionSalesroomGoods::getStatus,0);
wrapper1.eq(AuctionSalesroomGoods::getBackupStatus,false);
wrapper1.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
+
if (auctionSalesroomGoods!=null) {
- wrapper1.eq(AuctionSalesroomGoods::getSortNum, auctionSalesroomGoods.getSortNum() + 1);
- list.add(auctionSalesroomGoods.getSortNum()+1);
+ wrapper1.eq(AuctionSalesroomGoods::getSortNum, auctionSalesroomGoods.getSortNum() - 1);
+
}else{
- LambdaQueryWrapper<AuctionSalesroomGoods> wrappers=Wrappers.lambdaQuery();
- wrappers.eq(AuctionSalesroomGoods::getStatus,0);
- wrappers.eq(AuctionSalesroomGoods::getDelFlag,0);
- wrappers.eq(AuctionSalesroomGoods::getBackupStatus,false);
- wrappers.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
- wrappers.orderByAsc(AuctionSalesroomGoods::getSortNum);
- wrappers.last("limit 1");
- AuctionSalesroomGoods auctionSalesroomGoodss = this.getOne(wrappers);
- if (auctionSalesroomGoodss!=null){
- R<GoodsSku> goodsSkuOne = goodsSkuClient.getGoodsSkuOne(
- auctionSalesroomGoodss.getGoodsSkuId(), SecurityConstants.INNER);
- GoodsSku goodsSku=goodsSkuOne.getData();
- currentAuctionSalesroomGoods.setGoodsSkuName(goodsSku.getSkuName());
- currentAuctionSalesroomGoods.setGoodsSkuId(auctionSalesroomGoodss.getId());
- currentAuctionSalesroomGoods.setCoverPic(goodsSku.getCoverPic());
- currentAuctionSalesroomGoods.setStartTime(auctionSalesroomGoodss.getStartTime());
- currentAuctionSalesroomGoods.setGoodsSkustatus(auctionSalesroomGoodss.getStatus().getCode());
- currentAuctionSalesroomGoods.setListingDuration(auctionSalesroomGoodss.getListingDuration());
- auctionSalesroomVO.setCurrentAuctionSalesroomGoods(currentAuctionSalesroomGoods);
- wrappers.eq(AuctionSalesroomGoods::getSortNum, auctionSalesroomGoodss.getSortNum());
- list.add(auctionSalesroomGoodss.getSortNum());
- }
-
-
+ wrapper.orderByDesc(AuctionSalesroomGoods::getSortNum);
}
wrapper1.last("limit 1");
AuctionSalesroomGoods auctionSalesroomGoods1 = this.getOne(wrapper1);
@@ -259,14 +268,15 @@
nextAuctionSalesroomGoods.setGoodsSkustatus(auctionSalesroomGoods1.getStatus().getCode());
nextAuctionSalesroomGoods.setGoodsSkuId(auctionSalesroomGoods1.getId());
auctionSalesroomVO.setNextAuctionSalesroomGoods(nextAuctionSalesroomGoods);
+ list.add(auctionSalesroomGoods1.getId());
}
LambdaQueryWrapper<AuctionSalesroomGoods> wrapper2=Wrappers.lambdaQuery();
if(list.size()>0){
- wrapper2.notIn(AuctionSalesroomGoods::getSortNum,list);
+ wrapper2.notIn(AuctionSalesroomGoods::getId,list);
}
wrapper2.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
wrapper2.orderByAsc(AuctionSalesroomGoods::getStatus);
- wrapper2.orderByAsc(AuctionSalesroomGoods::getSortNum);
+ wrapper2.orderByDesc(AuctionSalesroomGoods::getSortNum);
wrapper2.eq(AuctionSalesroomGoods::getBackupStatus,false);
List<AuctionSalesroomGoods> auctionSalesroomGoods2 = this.list(wrapper2);
for (AuctionSalesroomGoods salesroomGoods:auctionSalesroomGoods2){
@@ -492,6 +502,7 @@
wrapper.eq(AuctionBidRecord::getTargetId, auctionSalesroomGoodsDTO.getGoodsSkuId());
wrapper.eq(AuctionBidRecord::getDelFlag, 0);
wrapper.orderByDesc(AuctionBidRecord::getLastBidAmount);
+ wrapper.orderByAsc(AuctionBidRecord::getLastBidTime);
auctionBidRecordList = auctionBidRecordMapper.selectList(wrapper);
if(auctionBidRecordList.size()>0){
//判断
@@ -521,7 +532,7 @@
}
}
}
-
+ auctionSalesroomGoods.setEndTime(LocalDateTime.now());
auctionSalesroomGoods.setStatus(AuctionGoodsStatusEnum.ENDED);
this.updateById(auctionSalesroomGoods);
@@ -592,6 +603,18 @@
AuctionSalesroomGoodsInfoVO.setSpec(goodsSku.getSpec());
AuctionSalesroomGoodsInfoVO.setSpecUnit(goodsSku.getSpecUnit());
+
+ LambdaQueryWrapper<AuctionBondJl> wrapper=Wrappers.lambdaQuery();
+ wrapper.eq(AuctionBondJl::getAuctionSalesroomId,byId.getId());
+ wrapper.eq(AuctionBondJl::getMemberId,auctionSalesroomGoodsInfoDTO.getMemberId());
+ wrapper.eq(AuctionBondJl::getIsState,0);
+ AuctionBondJl auctionBondJl = auctionBondJlMapper.selectOne(wrapper);
+ if (auctionBondJl!=null){
+ AuctionSalesroomGoodsInfoVO.setIsApply(2);
+ }else{
+ AuctionSalesroomGoodsInfoVO.setIsApply(1);
+ }
+
CustomConfig returnAddressUserName = sysUserClient.getconfig("MALL_ORDER_DESCRIPTION").getData();
AuctionSalesroomGoodsInfoVO.setExplain(returnAddressUserName.getConfigValue());
AuctionSalesroomGoodsInfoVO.setMinimumMarkupAmount(byId1.getMinimumMarkupAmount());
@@ -655,8 +678,17 @@
@Override
public List<AuctionBidRecordVO> getAuctionBidRecord(AuctionSalesroomGoodsInfoDTO auctionSalesroomGoodsInfoDTO) {
LambdaQueryWrapper<AuctionBidRecord> wrapper=Wrappers.lambdaQuery();
+
+ AuctionSalesroom byId = auctionSalesroomMapper.selectById(auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId());
+ if (byId==null){
+ LambdaQueryWrapper<AuctionSalesroom> wrapper1=Wrappers.lambdaQuery();
+ wrapper1.eq(AuctionSalesroom::getAuctionSalesroomNo,auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId());
+ wrapper1.eq(AuctionSalesroom::getDelFlag,0);
+ byId =auctionSalesroomMapper.selectOne(wrapper1);
+ }
+
if (auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId()!=null){
- wrapper.eq(AuctionBidRecord::getAuctionSalesroomId,auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId());
+ wrapper.eq(AuctionBidRecord::getAuctionSalesroomId,byId.getId());
}
wrapper.eq(AuctionBidRecord::getDelFlag,0);
wrapper.eq(AuctionBidRecord::getTargetId,auctionSalesroomGoodsInfoDTO.getGoodsSkuId());
@@ -742,7 +774,7 @@
CustomConfig memberPointsMoney = sysUserClient.getconfig("MEMBER_POINTS_MONEY").getData();
CustomConfig memberPointsPoints = sysUserClient.getconfig("MEMBER_POINTS_POINTS").getData();
- if (lastBidAmount.intValue()>0){
+ if (lastBidAmount.compareTo(BigDecimal.ZERO) > 0) {
BigDecimal divide = lastBidAmount.divide(new BigDecimal(memberPointsMoney.getConfigValue()));
BigDecimal roundedDown = divide.setScale(0, RoundingMode.DOWN);
BigDecimal aDouble= roundedDown.multiply(new BigDecimal(memberPointsPoints.getConfigValue()));
@@ -766,6 +798,7 @@
order.setSkuName(goodsSku.getSkuName());
order.setCoverPic(goodsSku.getCoverPic());
order.setPrice(lastBidAmount);
+ order.setGoodsId(auctionSalesroomGoods.getGoodsSkuId());
orderClient.saveOrderOne(order,SecurityConstants.INNER);
}
--
Gitblit v1.7.1