From 9bbd528db300cce1f373d1c2e812f67eb380cecd Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 31 七月 2024 23:40:07 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 62 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 22 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 caeef82..6cf205f 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
@@ -928,6 +928,13 @@
orderVO.setOrderShuoMin(memberPointsPoints.getConfigValue());
CustomConfig ReturnCycle = sysUserClient.getconfig("RETURN_CYCLE").getData();
orderVO.setOrderZq(Integer.valueOf(ReturnCycle.getConfigValue()));
+ // 查询售后记录
+ Optional<OrderReturnRequest> orderReturnRequestOpt = orderReturnRequestService.lambdaQuery()
+ .eq(OrderReturnRequest::getOrderId, order.getId()).oneOpt();
+ if (orderReturnRequestOpt.isPresent()) {
+ OrderReturnRequest orderReturnRequest = orderReturnRequestOpt.get();
+ orderVO.setStatus(orderReturnRequest.getStatus());
+ }
return orderVO;
}
@@ -1324,45 +1331,51 @@
Order byId1 = this.getById(goodsGroupPurchaseeVO1.getId());
GoodsGroupPurchase data = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(byId1.getGoodsSkuId(), SecurityConstants.INNER).getData();
- BeanUtils.copyProperties(data,goodsGroupPurchaseeVO1);
- GoodsSku byId = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();
- goodsGroupPurchaseeVO1.setGoodsSkuName(byId.getSkuName());
- goodsGroupPurchaseeVO1.setCoverPic(byId.getCoverPic());
- goodsGroupPurchaseeVO1.setPrice(byId.getPrice());
- goodsGroupPurchaseeVO1.setYears(String.valueOf(byId.getYears().getYear()));
- goodsGroupPurchaseeVO1.setIsGoodsGroupPurchase(2);
- if (byId1.getGroupNo()!=null){
- GoodsGroupPurchaseInfo one1 = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(byId1.getGroupNo(), SecurityConstants.INNER).getData();
- if (one1!=null) {
+ if (Objects.nonNull(data)) {
+ BeanUtils.copyProperties(data, goodsGroupPurchaseeVO1);
+ GoodsSku byId = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(),
+ SecurityConstants.INNER).getData();
+ goodsGroupPurchaseeVO1.setGoodsSkuName(byId.getSkuName());
+ goodsGroupPurchaseeVO1.setCoverPic(byId.getCoverPic());
+ goodsGroupPurchaseeVO1.setPrice(byId.getPrice());
+ goodsGroupPurchaseeVO1.setYears(String.valueOf(byId.getYears().getYear()));
+ goodsGroupPurchaseeVO1.setIsGoodsGroupPurchase(2);
+ if (byId1.getGroupNo() != null) {
+ GoodsGroupPurchaseInfo one1 = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(
+ byId1.getGroupNo(), SecurityConstants.INNER).getData();
+ if (one1 != null) {
goodsGroupPurchaseeVO1.setCurrentNumber(one1.getCurrentNumber());
if (one1.getGroupStatus() == 0) {
if (one1.getGroupSize() - one1.getCurrentNumber() < 5) {
goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.MS_FAILURE);
} else {
- goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.TO_FORM_A_GROUP);
+ goodsGroupPurchaseeVO1.setGroupStatus(
+ GroupStatusEnum.TO_FORM_A_GROUP);
}
}
if (one1.getGroupStatus() == 1) {
- goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.FORMED_INTO_A_GROUP);
+ goodsGroupPurchaseeVO1.setGroupStatus(
+ GroupStatusEnum.FORMED_INTO_A_GROUP);
}
if (one1.getGroupStatus() == 2) {
goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
}
- }else{
- if (data.getGroupStatus().getCode()==1){
+ } else {
+ if (data.getGroupStatus().getCode() == 1) {
goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.TO_FORM_A_GROUP);
}
- if (data.getGroupStatus().getCode()==2){
- goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.FORMED_INTO_A_GROUP);
+ if (data.getGroupStatus().getCode() == 2) {
+ goodsGroupPurchaseeVO1.setGroupStatus(
+ GroupStatusEnum.FORMED_INTO_A_GROUP);
}
- if (data.getGroupStatus().getCode()==3){
+ if (data.getGroupStatus().getCode() == 3) {
goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
}
+ }
+
}
}
-
-
}
@@ -1445,6 +1458,7 @@
if (CollUtils.isNotEmpty(orderIdList)) {
List<OrderReturnRequest> orderReturnRequestList = orderReturnRequestService.lambdaQuery()
.in(OrderReturnRequest::getOrderId, orderIdList)
+ .eq(OrderReturnRequest::getStatus, ReturnRequestStatusEnum.COMPLETED)
.eq(OrderReturnRequest::getAuditStatus, AuditStatusEnum.PASSED).list();
List<Long> orderReturnRequestPassedIds = orderReturnRequestList.stream()
.map(OrderReturnRequest::getOrderId)
@@ -1638,6 +1652,10 @@
order.setOrderStatus(OrderStatusEnum.FINISHED);
order.setReceiveTime(LocalDateTime.now());
this.updateById(order);
+ // 拍卖订单退保证金
+ if (order.getOrderFrom() == OrderFromEnum.AUCTION_ORDERS) {
+ refundBond(id);
+ }
}
}
@@ -1780,16 +1798,16 @@
if (order.getAuctionOrderType() == AuctionOrderTypeEnum.AUCTION_ITEMS) {
orderAuctionBond = orderAuctionBondMapper.selectOne(
Wrappers.lambdaQuery(OrderAuctionBond.class)
- .eq(OrderAuctionBond::getOrderId, id)
.eq(OrderAuctionBond::getAuctionSalesroomId,
order.getAuctionSalesroomId())
+ .eq(OrderAuctionBond::getMemberId, order.getMemberId())
.eq(OrderAuctionBond::getBoundStatus, BondStatusEnum.PAID));
} else {
orderAuctionBond = orderAuctionBondMapper.selectOne(
Wrappers.lambdaQuery(OrderAuctionBond.class)
- .eq(OrderAuctionBond::getOrderId, id)
.eq(OrderAuctionBond::getAuctionGoodsId,
order.getGoodsSkuId())
+ .eq(OrderAuctionBond::getMemberId, order.getMemberId())
.eq(OrderAuctionBond::getBoundStatus, BondStatusEnum.PAID));
}
if (StringUtils.isNotNull(orderAuctionBond)) {
@@ -1802,7 +1820,7 @@
paylog.setState(3);// 已退款
orderAuctionBond.setBoundStatus(BondStatusEnum.REFUNDED);
iPaylogService.updateById(paylog);
- this.updateById(order);
+ orderAuctionBondMapper.updateById(orderAuctionBond);
}
}
}
--
Gitblit v1.7.1