From ac54696d00ec5941e9124d6881aea59f06d525c2 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期三, 31 七月 2024 19:52:53 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 18 +++---------------
1 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 80a84e4..f6658b5 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -897,23 +897,11 @@
orderVO.setAuctionType(order.getAuctionOrderType());
orderVO.setCouponId(order.getCouponId());
orderVO.setBound(order.getBound());
+ orderVO.setIsRequest(order.getIsRequest());
if (orderVO.getOrderFrom().getCode()==3){
GoodsGroupPurchase data = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
orderVO.setGroupTime(data.getGroupTime());
orderVO.setSkuId(data.getGoodsSkuId());
- }
-
- OrderReturnRequest orderReturnRequest = orderReturnRequestService.getOne(
- Wrappers.lambdaQuery(OrderReturnRequest.class)
- .eq(OrderReturnRequest::getOrderId,
- orderVO.getId()).eq(OrderReturnRequest::getDelFlag,
- 0).last("limit 1"));
- if (StringUtils.isNotNull(orderReturnRequest)&&orderReturnRequest!=null) {
- orderVO.setStatus(orderReturnRequest.getStatus());
- orderVO.setRequestId(orderReturnRequest.getId());
- orderVO.setIsRequest(2);
- }else{
- orderVO.setIsRequest(1);
}
LambdaQueryWrapper<OrderAuctionBond> wrapper3= Wrappers.lambdaQuery();
@@ -1169,7 +1157,7 @@
wrapper.eq(OrderAuctionBond::getOrderId,order.getId());
OrderAuctionBond orderAuctionBond = orderAuctionBondMapper.selectOne(wrapper);
if(orderAuctionBond!=null){
- if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 1) {//支付宝
+ if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 2) {//支付宝
//获取支付信息
LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
paylogEntityWrapper.eq(Paylog::getOutTradeNo, orderAuctionBond.getOrderNo());
@@ -1178,7 +1166,7 @@
if (!bo) {
System.out.println("支付宝退款失败");
}
- } else if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 2) {//微信
+ } else if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 1) {//微信
//获取支付信息
LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
paylogEntityWrapper.eq(Paylog::getOutTradeNo, orderAuctionBond.getOrderNo());
--
Gitblit v1.7.1