From de0026f420814a34a0e94c2de702b563b7e9234e Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 31 七月 2024 16:10:12 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 68 ++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 20 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 8b6c194..59f52a4 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
@@ -7,11 +7,11 @@
import com.google.common.collect.Lists;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.enums.*;
import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
import com.ruoyi.common.core.enums.AuditStatusEnum;
import com.ruoyi.common.core.enums.BondStatusEnum;
import com.ruoyi.common.core.enums.CouponUseEnum;
+import com.ruoyi.common.core.enums.GroupStatusEnum;
import com.ruoyi.common.core.enums.OrderFromEnum;
import com.ruoyi.common.core.enums.OrderStatusEnum;
import com.ruoyi.common.core.enums.OrderTypeEnum;
@@ -65,7 +65,11 @@
import com.ruoyi.system.api.domain.dto.MgtAfterSaleSettingDTO;
import com.ruoyi.system.api.domain.dto.OrderDTO;
import com.ruoyi.system.api.domain.dto.updMembeOneDTO;
-import com.ruoyi.system.api.domain.vo.*;
+import com.ruoyi.system.api.domain.vo.Express100VO;
+import com.ruoyi.system.api.domain.vo.MemberOrderListVO;
+import com.ruoyi.system.api.domain.vo.MemberOrderNumVO;
+import com.ruoyi.system.api.domain.vo.MemberTiOrderVO;
+import com.ruoyi.system.api.domain.vo.OrderVO;
import com.ruoyi.system.api.feignClient.AuctionClient;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import com.ruoyi.system.api.feignClient.MemberClient;
@@ -80,6 +84,7 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.Optional;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
@@ -168,6 +173,9 @@
order.setOrderFrom(OrderFromEnum.AUCTION_ORDERS);
order.setOrderNo(OrderUtil.getOrderNoForPrefix("PM"));
order.setIsOrder(1);
+ if (OrderDTO.getAuctionType().equals(AuctionOrderTypeEnum.AUCTION_ITEMS)) {
+ order.setAuctionSalesroomId(OrderDTO.getAuctionSalesroomId());
+ }
}
order.setOrderTime(OrderDTO.getOrderTime());
order.setOrderFrom(OrderDTO.getOrderFrom());
@@ -908,6 +916,7 @@
LambdaQueryWrapper<OrderAuctionBond> wrapper3= Wrappers.lambdaQuery();
wrapper3.eq(OrderAuctionBond::getOrderId,order.getId());
+ wrapper3.or().eq(OrderAuctionBond::getOrderNo, order.getOrderNo());
OrderAuctionBond orderAuctionBond = orderAuctionBondMapper.selectOne(wrapper3);
if (orderAuctionBond!=null){
if (orderAuctionBond.getBoundStatus().getCode()==1||orderAuctionBond.getBoundStatus().getCode()==2){
@@ -1368,7 +1377,9 @@
*/
@Override
public List<Order> getOrderByCouponIds(Collection<Long> couponIds) {
- return this.lambdaQuery().in(Order::getCouponId, couponIds).list();
+ return this.lambdaQuery().in(Order::getCouponId, couponIds)
+ .ne(Order::getOrderStatus, OrderStatusEnum.CANCELED).eq(Order::getIsRequest, 1)
+ .list();
}
/**
@@ -1417,6 +1428,8 @@
query.getSkuName())
.eq(StringUtils.isNotNull(query.getOrderStatus()), Order::getOrderStatus,
query.getOrderStatus())
+ .eq(StringUtils.isNotNull(query.getOrderStatus()) && query.getOrderStatus()
+ .equals(OrderStatusEnum.FINISHED), Order::getIsRequest, 1)
.orderByDesc(Order::getCreateTime)
.page(new Page<>(query.getPageCurr(), query.getPageSize()));
if (StringUtils.isEmpty(page.getRecords())) {
@@ -1424,6 +1437,22 @@
}
pageVO = PageDTO.of(page, MgtOrderVO.class);
List<MgtOrderVO> voList = pageVO.getList();
+ List<Long> orderIdList = voList.stream().filter(order -> order.getIsRequest().equals(2))
+ .map(MgtOrderVO::getId).collect(
+ Collectors.toList());
+ if (CollUtils.isNotEmpty(orderIdList)) {
+ List<OrderReturnRequest> orderReturnRequestList = orderReturnRequestService.lambdaQuery()
+ .in(OrderReturnRequest::getOrderId, orderIdList)
+ .eq(OrderReturnRequest::getAuditStatus, AuditStatusEnum.PASSED).list();
+ List<Long> orderReturnRequestPassedIds = orderReturnRequestList.stream()
+ .map(OrderReturnRequest::getOrderId)
+ .collect(Collectors.toList());
+ for (MgtOrderVO order : voList) {
+ if (orderReturnRequestPassedIds.contains(order.getId())) {
+ order.setIsRequest(3);
+ }
+ }
+ }
if (query.getQueryType() == OrderTypeEnum.AUCTION_ORDER) {
List<MgtOrderVO> list = voList;
// 封装参数查询拍卖会
@@ -1440,9 +1469,6 @@
salesroomMap = auctionSalesroomList.stream()
.collect(Collectors.toMap(AuctionSalesroom::getId,
AuctionSalesroom::getSalesroomName));
- auctionSalesroomList.stream()
- .map(AuctionSalesroom::getId)
- .collect(Collectors.toSet());
}
// 封装参数查询拍卖订单保证金
Set<Long> auctionGoodsIdSet = list.stream()
@@ -1627,36 +1653,38 @@
throw new ServiceException("该订单已是售后状态");
}
String orderNo = order.getOrderNo();
- Paylog paylog = iPaylogService.lambdaQuery().eq(Paylog::getOutTradeNo, orderNo)
- .last("limit 1").one();
+ Optional<Paylog> paylogOpt = iPaylogService.lambdaQuery().eq(Paylog::getOutTradeNo, orderNo)
+ .last("limit 1").oneOpt();
PaymentMethodEnum paymentMethod = order.getPaymentMethod();
- if (StringUtils.isNotNull(paylog)) {
+ if (paylogOpt.isPresent()) {
+ Paylog paylog = paylogOpt.get();
boolean result = handleRefund(paymentMethod, paylog, orderNo);
if (result) {
paylog.setState(3);// 已退款
iPaylogService.updateById(paylog);
}
- OrderReturnRequest orderReturnRequest = new OrderReturnRequest();
- orderReturnRequest.setOrderId(id);
- orderReturnRequest.setRequestTime(LocalDateTime.now());
- orderReturnRequest.setRequestType(RequestTypeEnum.REFUND);
- orderReturnRequest.setRequestReason("管理后台退款");
- orderReturnRequest.setStatus(ReturnRequestStatusEnum.COMPLETED);
- orderReturnRequest.setAuditStatus(AuditStatusEnum.PASSED);
- orderReturnRequest.setAuditTime(LocalDateTime.now());
- orderReturnRequestService.save(orderReturnRequest);
}
order.setIsRequest(2);
this.updateById(order);
+ // 生成售后记录
+ OrderReturnRequest orderReturnRequest = new OrderReturnRequest();
+ orderReturnRequest.setOrderId(id);
+ orderReturnRequest.setRequestTime(LocalDateTime.now());
+ orderReturnRequest.setRequestType(RequestTypeEnum.REFUND);
+ orderReturnRequest.setRequestReason("管理后台退款");
+ orderReturnRequest.setStatus(ReturnRequestStatusEnum.COMPLETED);
+ orderReturnRequest.setAuditStatus(AuditStatusEnum.PASSED);
+ orderReturnRequest.setAuditTime(LocalDateTime.now());
+ orderReturnRequestService.save(orderReturnRequest);
// 扣除订单积分
Member member = memberClient.getMembeOne(order.getMemberId(), SecurityConstants.INNER)
.getData();
if (StringUtils.isNotNull(member)) {
MemberPointsDTO memberPointsDTO = new MemberPointsDTO();
memberPointsDTO.setMemberId(order.getMemberId());
- memberPointsDTO.setPointsType(1);
- memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE);
+ memberPointsDTO.setPointsType(2);
+ memberPointsDTO.setPointsStatus(PointStatusEnum.REDUCE);
memberPointsDTO.setPoints(order.getPoints());
memberClient.addMemberPoints(memberPointsDTO);
--
Gitblit v1.7.1