From c23f48c5ec15476299edadd91fa18f908d710a4f Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期四, 18 七月 2024 08:58:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
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 9ec9827..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
@@ -8,6 +8,7 @@
import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
import com.ruoyi.common.core.enums.BondStatusEnum;
import com.ruoyi.common.core.enums.PaymentMethodEnum;
+import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.order.domain.Paylog;
import com.ruoyi.order.mapper.OrderAuctionBondMapper;
@@ -23,11 +24,15 @@
import com.ruoyi.system.api.domain.dto.RefundDTO;
import com.ruoyi.system.api.domain.vo.PayInfoVO;
import com.ruoyi.system.api.feignClient.AuctionClient;
+
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
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;
@@ -63,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);
@@ -78,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("微信退款失败！");
}
@@ -130,14 +141,22 @@
PayInfoVO payInfoVO = new PayInfoVO();
if (memberAuctionSalesroomBondDTO.getBondType() == 1) {
AuctionGoods data = auctionClient.getauctionGoodsOne(memberAuctionSalesroomBondDTO, SecurityConstants.INNER).getData();
- if (data.getBond().intValue() == 0) {
+
+ if (LocalDateTime.now().isAfter(data.getEndTime())){
+ throw new ServiceException("商品拍卖已结束");
+ }
+ if (data.getListingStatus().getCode()==1){
+ throw new ServiceException("商品拍卖下线");
+ }
+
+ if (data.getBond()==null||data.getBond().intValue() == 0) {
OrderAuctionBond orderAuctionBond = new OrderAuctionBond();
orderAuctionBond.setOrderNo(OrderUtil.getOrderNoForPrefix("BO"));
orderAuctionBond.setAuctionGoodsId(memberAuctionSalesroomBondDTO.getAuctionGoodsId());
orderAuctionBond.setMemberId(memberAuctionSalesroomBondDTO.getMemberId());
orderAuctionBond.setBond(data.getBond());
orderAuctionBond.setBoundStatus(BondStatusEnum.PAID);
- orderAuctionBond.setBondType(AuctionOrderTypeEnum.AUCTION_ITEMS);
+ orderAuctionBond.setBoundStatus(BondStatusEnum.TO_PLAY);
this.save(orderAuctionBond);
payInfoVO.setOrderNO(orderAuctionBond.getOrderNo());
payInfoVO.setType(0);
@@ -150,22 +169,22 @@
orderAuctionBond.setAuctionGoodsId(memberAuctionSalesroomBondDTO.getAuctionGoodsId());
orderAuctionBond.setMemberId(memberAuctionSalesroomBondDTO.getMemberId());
orderAuctionBond.setBond(data.getBond());
+ orderAuctionBond.setOrderTimeSx(data.getEndTime());
orderAuctionBond.setBoundStatus(BondStatusEnum.TO_PLAY);
- orderAuctionBond.setBondType(AuctionOrderTypeEnum.AUCTION_ITEMS);
+ orderAuctionBond.setBondType(AuctionOrderTypeEnum.REGULAR_ITEMS);
if (memberAuctionSalesroomBondDTO.getPaymentMethod() == 1) {
orderAuctionBond.setPaymentMethod(PaymentMethodEnum.WECHAT);
} else {
orderAuctionBond.setPaymentMethod(PaymentMethodEnum.ALIPAY);
}
-
this.save(orderAuctionBond);
-
payInfoVO.setOrderNO(orderAuctionBond.getOrderNo());
if (memberAuctionSalesroomBondDTO.getPaymentMethod() == 1) {
payInfoVO.setType(2);
} else {
payInfoVO.setType(1);
}
+ payInfoVO.setOrderNO(orderAuctionBond.getOrderNo());
payInfoVO.setSubject("保证金");
payInfoVO.setMemberId(memberAuctionSalesroomBondDTO.getMemberId());
payInfoVO.setBody("保证金");
@@ -207,6 +226,7 @@
} else {
payInfoVO.setType(1);
}
+ payInfoVO.setOrderNO(orderAuctionBond.getOrderNo());
payInfoVO.setSubject("保证金");
payInfoVO.setMemberId(memberAuctionSalesroomBondDTO.getMemberId());
payInfoVO.setBody("保证金");
--
Gitblit v1.7.1