From b919f4d1a998b670dac6ea61edb7aa52fc0068a0 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:09 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 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 987e1c0..0ced8f2 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
@@ -326,7 +326,7 @@
}
} else {
// 中标
- for (int i = 0; i < auctionGoods.getAuctionStock(); i++) {
+ for (int i = 0; i < auctionBidRecords.size(); i++) {
AuctionBidRecord auctionBidRecord = auctionBidRecords.get(i);
auctionBidRecord.setStatus(BidStatusEnum.SUCCESSFUL);
auctionBidRecordList.add(auctionBidRecord);
@@ -335,7 +335,7 @@
GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
goodsStockUpdDTO.setGoodsSkuId(auctionGoods.getGoodsSkuId());
goodsStockUpdDTO.setAuctionStock(
- auctionGoods.getAuctionStock() - auctionBidRecordList.size());
+ auctionGoods.getAuctionStock() - auctionBidRecords.size());
goodsSkuClient.updGoodsStock(Lists.newArrayList(goodsStockUpdDTO),
SecurityConstants.INNER);
}
@@ -410,6 +410,7 @@
RefundDTO refundDTO = new RefundDTO();
refundDTO.setOrderNo(orderAuctionBond.getOrderNo());
refundDTO.setAmount(orderAuctionBond.getBond());
+ refundDTOList.add(refundDTO);
}
// 远程调用订单服务进行退款
Map<String, Object> data = orderClient.refund(refundDTOList,
@@ -434,7 +435,8 @@
return null;
}).filter(Objects::nonNull).collect(Collectors.toList());
// 远程调用订单服务修改订单状态
- orderClient.updateOrderAuctionBondStatus(ids, BondStatusEnum.PAID,SecurityConstants.INNER);
+ orderClient.updateOrderAuctionBondStatus(ids, BondStatusEnum.REFUNDED,
+ SecurityConstants.INNER);
}
}
}
@@ -446,12 +448,23 @@
List<GoodsSku> goodsSku = goodsSkuClient.getGoodsByName(auctionGoodsListDTO.getGoodsSkuName(),
SecurityConstants.INNER)
.getData();
- goodsSkuIdList = goodsSku.stream().map(GoodsSku::getId)
- .collect(Collectors.toSet());
+ if (goodsSku!=null){
+ goodsSkuIdList = goodsSku.stream().map(GoodsSku::getId)
+ .collect(Collectors.toSet());
+ }
+
}
AuctionGoodsListPageDTO auctionGoodsListPageDTO=new AuctionGoodsListPageDTO();
- auctionGoodsListPageDTO.setGoodsSkuIdList(goodsSkuIdList);
+ if (StringUtils.isNotEmpty(auctionGoodsListDTO.getGoodsSkuName())) {
+ if (goodsSkuIdList != null) {
+ auctionGoodsListPageDTO.setGoodsSkuIdList(goodsSkuIdList);
+ } else {
+ goodsSkuIdList = new HashSet<>();
+ goodsSkuIdList.add(0L);
+ auctionGoodsListPageDTO.setGoodsSkuIdList(goodsSkuIdList);
+ }
+ }
Page<AuctionGoodsListVO> page = new Page<>();
page.setSize(auctionGoodsListDTO.getPageSize());
@@ -521,7 +534,6 @@
auctionGoodsinfoVO.setSpec(goodsSkuOne.getSpec());
auctionGoodsinfoVO.setSpecUnit(goodsSkuOne.getSpecUnit());
auctionGoodsinfoVO.setShareTitle(goodsSkuOne.getShareTitle());
- auctionGoodsinfoVO.setSpecUnit(goodsSkuOne.getSpecUnit());
auctionGoodsinfoVO.setDetail(goodsSkuOne.getDetail());
auctionGoodsinfoVO.setBond(byId.getBond());
auctionGoodsinfoVO.setYears(goodsSkuOne.getYears());
@@ -565,11 +577,14 @@
auctionGoodsinfoVO.setIsCollection(1);
}
List<OrderAuctionBond> datas = orderClient.getAuctionGoodsOrderAuctionBondList(auctionGoodsListDTO, SecurityConstants.INNER).getData();
- if (datas.size()>0){
- auctionGoodsinfoVO.setIsApply(2);
- }else{
- auctionGoodsinfoVO.setIsApply(1);
- }
+ if(datas!=null){
+ if (datas.size()>0){
+ auctionGoodsinfoVO.setIsApply(2);
+ }else{
+ auctionGoodsinfoVO.setIsApply(1);
+ }
+
+ }
LocalDateTime now = LocalDateTime.now();
LocalDateTime newTime7 = now.minusDays(7);
@@ -651,7 +666,7 @@
Page<AuctionGoodsListVO> page = new Page<>();
page.setSize(auctionGoodsListDTO.getPageSize());
page.setCurrent(auctionGoodsListDTO.getPageCurr());
- List<AuctionGoods> auctionGoodsPgeList = auctionGoodsMapper.getAuctionGoodsPgeList(page, auctionGoodsListPageDTO);
+ List<AuctionGoods> auctionGoodsPgeList = auctionGoodsMapper.getAuctionGoodsPgeList1(page, auctionGoodsListPageDTO);
List<AuctionGoodsListVO> auctionGoodsVOS=new ArrayList<>();
for (AuctionGoods auctionGoods:auctionGoodsPgeList){
AuctionGoodsListVO auctionGoodsVO=new AuctionGoodsListVO();
@@ -696,8 +711,7 @@
@Transactional
public void endAuctionGoods(Long id) throws JsonProcessingException {
AuctionGoods auctionGoods = this.getById(id);
- if (StringUtils.isNotNull(auctionGoods) && auctionGoods.getListingStatus().equals(
- ListingStatusEnum.ON_SHELVES) && auctionGoods.getStartStatus()
+ if (StringUtils.isNotNull(auctionGoods) && auctionGoods.getStartStatus()
.equals(AuctionStartStatusEnum.IN_AUCTION)) {
// 远程调用商品服务，获取商品信息
GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(auctionGoods.getGoodsSkuId(),
@@ -718,7 +732,7 @@
}
} else {
// 中标
- for (int i = 0; i < auctionGoods.getAuctionStock(); i++) {
+ for (int i = 0; i < auctionBidRecords.size(); i++) {
AuctionBidRecord auctionBidRecord = auctionBidRecords.get(i);
auctionBidRecord.setStatus(BidStatusEnum.SUCCESSFUL);
auctionBidRecordList.add(auctionBidRecord);
@@ -802,6 +816,7 @@
RefundDTO refundDTO = new RefundDTO();
refundDTO.setOrderNo(orderAuctionBond.getOrderNo());
refundDTO.setAmount(orderAuctionBond.getBond());
+ refundDTOList.add(refundDTO);
}
// 远程调用订单服务进行退款
Map<String, Object> data = orderClient.refund(refundDTOList,
--
Gitblit v1.7.1