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 | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 384b13d..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,7 +7,6 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Lists;
import com.ruoyi.auction.domain.AuctionBidRecord;
-import com.ruoyi.auction.domain.AuctionBondJl;
import com.ruoyi.auction.mapper.AuctionBidRecordMapper;
import com.ruoyi.auction.mapper.AuctionBondJlMapper;
import com.ruoyi.auction.mapper.AuctionSalesroomGoodsMapper;
@@ -25,6 +24,7 @@
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.AuctionBondJl;
import com.ruoyi.system.api.domain.AuctionSalesroom;
import com.ruoyi.system.api.domain.AuctionSalesroomGoods;
import com.ruoyi.system.api.domain.CustomConfig;
@@ -155,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);
@@ -498,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){
//判断
@@ -769,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()));
@@ -793,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