From e2659d65be6494f9f737cddcec8292ac39cc5c06 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 17 七月 2024 23:20:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java | 1
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java | 32 +++++++++++++---
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java | 5 ++
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java | 14 +++++-
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java | 19 +++++----
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java | 2
6 files changed, 54 insertions(+), 19 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 3f36bd0..a00f525 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
@@ -298,7 +298,10 @@
}else {
articleCommentsVO1.setIslike(2);
}
- articleCommentsVOList1.add(articleCommentsVO1);
+ if (data1!=null){
+ articleCommentsVOList1.add(articleCommentsVO1);
+ }
+
}
articleCommentsVO.setArticleCommentsVOList(articleCommentsVOList1);
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 f68a7fc..5f3e4b1 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
@@ -373,7 +373,7 @@
}
}
- List<Long> list=new ArrayList<>();
+ Set<Long> list=new HashSet<>();
LambdaQueryWrapper<AuctionBidRecord> wrapper = Wrappers.lambdaQuery();
wrapper.eq(AuctionBidRecord::getAuctionSalesroomId, ationSalesroomGoodsDTO.getAuctionSalesroomId());
wrapper.eq(AuctionBidRecord::getDelFlag, 0);
@@ -635,7 +635,9 @@
@Override
public List<AuctionBidRecordVO> getAuctionBidRecord(AuctionSalesroomGoodsInfoDTO auctionSalesroomGoodsInfoDTO) {
LambdaQueryWrapper<AuctionBidRecord> wrapper=Wrappers.lambdaQuery();
- wrapper.eq(AuctionBidRecord::getAuctionSalesroomId,auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId());
+ if (auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId()!=null){
+ wrapper.eq(AuctionBidRecord::getAuctionSalesroomId,auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId());
+ }
wrapper.eq(AuctionBidRecord::getDelFlag,0);
wrapper.eq(AuctionBidRecord::getTargetId,auctionSalesroomGoodsInfoDTO.getGoodsSkuId());
wrapper.orderByDesc(AuctionBidRecord::getLastBidAmount);
@@ -652,7 +654,9 @@
auctionBidRecordVOList.add(auctionBidRecordVO);
}
LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery();
- wrapper1.eq(AuctionBidRecord::getAuctionSalesroomId,auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId());
+ if (auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId()!=null){
+ wrapper.eq(AuctionBidRecord::getAuctionSalesroomId,auctionSalesroomGoodsInfoDTO.getAuctionSalesroomId());
+ }
wrapper1.eq(AuctionBidRecord::getDelFlag,0);
wrapper1.eq(AuctionBidRecord::getTargetId,auctionSalesroomGoodsInfoDTO.getGoodsSkuId());
wrapper1.eq(AuctionBidRecord::getMemberId,auctionSalesroomGoodsInfoDTO.getMemberId());
@@ -673,9 +677,25 @@
auctionBidRecordVO.setLastBidTime(auctionBidRecord.getLastBidTime());
Member data = emberClient.getMembeOne(auctionBidRecord.getMemberId(),
SecurityConstants.INNER).getData();
- auctionBidRecordVO.setMemberName(data.getNickname());
- auctionBidRecordVO.setMemberId(data.getId());
- auctionBidRecordVOList.add(auctionBidRecordVO);
+ if (data!=null){
+ auctionBidRecordVO.setMemberName(data.getNickname());
+ auctionBidRecordVO.setMemberId(data.getId());
+ }
+ if (data!=null){
+ Boolean b=false;
+ for (AuctionBidRecordVO auctionBidRecordVOs:auctionBidRecordVOList){
+ if (auctionBidRecordVOs.getMemberId().equals(data.getId())){
+ b=true;
+ break;
+ }
+ }
+ if (!b){
+ auctionBidRecordVOList.add(auctionBidRecordVO);
+ }
+ }else{
+ auctionBidRecordVOList.add(auctionBidRecordVO);
+ }
+
}
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
index bf73784..63bc930 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
@@ -623,11 +623,6 @@
if (byId.getStartingPrice().doubleValue()>bidVO.getLastBidAmount().doubleValue()){
throw new ServiceException("出价不能比起拍价低");
}
- BigDecimal bigDecimal=byId.getStartingPrice().add(byId.getMinimumMarkupAmount());
- if (bigDecimal.doubleValue()>bidVO.getLastBidAmount().doubleValue()){
- throw new ServiceException("出价不能比每次最少加价低");
- }
-
LambdaQueryWrapper<AuctionBidRecord> wrapper3=Wrappers.lambdaQuery();
wrapper3.eq(AuctionBidRecord::getAuctionSalesroomId,bidVO.getAuctionSalesroomId());
@@ -641,6 +636,14 @@
throw new ServiceException("出价不能比当前最高价低");
}
}
+
+ BigDecimal bigDecimal=byId.getStartingPrice().add(byId.getMinimumMarkupAmount());
+ if (bigDecimal.doubleValue()>bidVO.getLastBidAmount().doubleValue()){
+ throw new ServiceException("出价不能比每次最少加价低");
+ }
+
+
+
LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery();
@@ -665,7 +668,7 @@
one.setTargetId(bidVO.getTargetId());
one.setMemberId(bidVO.getMemberId());
one.setLastBidTime(LocalDateTime.now());
- if(membeOne.getRealName()!=null||membeOne.getRealName()!=""){
+ if(membeOne.getRealName()!=null&&membeOne.getRealName()!=""){
one.setNickname(membeOne.getRealName());
}else{
one.setNickname(membeOne.getNickname());
@@ -1492,8 +1495,8 @@
Wrappers.<AuctionBidRecord>lambdaQuery()
.eq(AuctionBidRecord::getAuctionSalesroomId, auctionSalesroomId)
.eq(AuctionBidRecord::getStatus, BidStatusEnum.ELIMINATE));
- List<Long> memberIdlist = auctionBidRecordList.stream().map(AuctionBidRecord::getMemberId)
- .collect(Collectors.toList());
+ Set<Long> memberIdlist = auctionBidRecordList.stream().map(AuctionBidRecord::getMemberId)
+ .collect(Collectors.toSet());
if (StringUtils.isNotEmpty(memberIdlist)) {
OrderAuctionBondDTO orderAuctionBondDTO = new OrderAuctionBondDTO();
orderAuctionBondDTO.setAuctionSalesroomId(auctionSalesroom.getId());
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java
index 029f103..94410aa 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java
@@ -61,7 +61,7 @@
LambdaQueryWrapper<Order> wrapper= Wrappers.lambdaQuery();
wrapper.eq(Order::getMemberId,OrderDTO.getMemberId());
- wrapper.eq(Order::getOrderStatus,4);
+ wrapper.eq(Order::getOrderFrom,4);
wrapper.eq(Order::getAuctionOrderType,2 );
wrapper.eq(Order::getGoodsSkuId,OrderDTO.getGoodsSkuId());
wrapper.eq(Order::getDelFlag,0);
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java
index cba8537..51085f9 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java
@@ -110,6 +110,7 @@
wrapper.eq(Order::getMemberId,memberInvoiceRiseDTO.getMemberId());
wrapper.eq(Order::getOrderStatus,4);
wrapper.eq(Order::getDelFlag,0);
+ wrapper.gt(Order::getTotalAmount,0);
List<Integer> list=new ArrayList<>();
if (memberInvoiceRiseDTO.getOrderType()==1){
list.add(2);
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java
index e98266a..0be4bdf 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java
@@ -31,6 +31,8 @@
import java.util.Map;
import java.util.Objects;
import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
@@ -66,7 +68,7 @@
public R<T> getOrderAuctionBond(OrderAuctionBondDTO orderAuctionBondDTO) {
LambdaQueryWrapper<OrderAuctionBond> wrapper = Wrappers.lambdaQuery();
- wrapper.notIn(OrderAuctionBond::getMemberId, orderAuctionBondDTO.getUserList());
+ wrapper.in(OrderAuctionBond::getMemberId, orderAuctionBondDTO.getUserList());
wrapper.eq(OrderAuctionBond::getDelFlag, 0);
wrapper.eq(OrderAuctionBond::getAuctionSalesroomId, orderAuctionBondDTO.getAuctionSalesroomId());
List<OrderAuctionBond> orderAuctionBondList = this.list(wrapper);
@@ -81,11 +83,17 @@
return R.fail("支付宝退款失败！");
}
} else {//微信
- String refundMoney = SinataUtil.doubleRetainTwo(orderAuctionBond.getBond().doubleValue() * 100d);
+ String refundMoney = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
Integer refundFee = Integer.parseInt(refundMoney.substring(0, refundMoney.length() - 3));
String money = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
Integer totalFee = Integer.parseInt(money.substring(0, money.length() - 3));
- boolean bo = paylogServiceImpl.refundForWxpay(1, paylog.getTradeNo(), paylog.getOutTradeNo(), orderAuctionBond.getOrderNo(), totalFee, refundFee, "2");
+ refundFee = Integer.parseInt(money.substring(0, money.length() - 3));
+
+ String regEx = "[^0-9]";
+ Pattern p = Pattern.compile(regEx);
+ Matcher m = p.matcher(paylog.getOutTradeNo());
+ String ma = m.replaceAll("").trim();
+ boolean bo = paylogServiceImpl.refundForWxpay(4, paylog.getTradeNo(), paylog.getOutTradeNo(), "R" + ma, totalFee, refundFee, "2");
if (!bo) {
return R.fail("微信退款失败！");
}
--
Gitblit v1.7.1