From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 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 31c0363..59e3413 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
@@ -8,6 +8,17 @@
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.OrderFromEnum;
+import com.ruoyi.common.core.enums.OrderStatusEnum;
+import com.ruoyi.common.core.enums.OrderTypeEnum;
+import com.ruoyi.common.core.enums.PaymentMethodEnum;
+import com.ruoyi.common.core.enums.PointStatusEnum;
+import com.ruoyi.common.core.enums.RequestTypeEnum;
+import com.ruoyi.common.core.enums.ReturnRequestStatusEnum;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.page.BeanUtils;
@@ -18,7 +29,6 @@
import com.ruoyi.order.controller.management.dto.MgtOrderQuery;
import com.ruoyi.order.controller.management.vo.MgtOrderReturnRequestVO;
import com.ruoyi.order.controller.management.vo.MgtOrderVO;
-import com.ruoyi.order.domain.MemberInvoiceOrder;
import com.ruoyi.order.domain.OrderReturnRequest;
import com.ruoyi.order.domain.Paylog;
import com.ruoyi.order.mapper.OrderAuctionBondMapper;
@@ -69,6 +79,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
@@ -228,7 +239,7 @@
*/
@Override
public Integer getGroupPurchasesGoodsNum(Long id) {
- List<Order> list = this.lambdaQuery().eq(Order::getId, id)
+ List<Order> list = this.lambdaQuery().eq(Order::getGoodsSkuId, id)
.in(Order::getOrderStatus, OrderStatusEnum.TO_BE_SHIPPED,
OrderStatusEnum.GOODS_TO_BE_RECEIVED, OrderStatusEnum.FINISHED).list();
return list.stream().map(Order::getGoodsQuantity).reduce(0, Integer::sum);
@@ -778,7 +789,7 @@
}
wrapper.eq(Order::getIsOrder,1);
wrapper.eq(Order::getDelFlag,0);
- wrapper.orderByDesc(Order::getCancelTime);
+ wrapper.orderByDesc(Order::getCreateTime);
Page<Order> page1 = this.page(page, wrapper);
PageDTO<MemberOrderListVO> memberOrderListVOPageDTO = PageDTO.of(page1, MemberOrderListVO.class);
@@ -874,6 +885,7 @@
OrderVO orderVO=new OrderVO();
try {
orderVO = BeanUtils.copyBean(order, OrderVO.class);
+ orderVO.setAuctionType(order.getAuctionOrderType());
if (orderVO.getOrderFrom().getCode()==3){
GoodsGroupPurchase data = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
orderVO.setGroupTime(data.getGroupTime());
@@ -1315,6 +1327,7 @@
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());
@@ -1328,18 +1341,14 @@
if (one1.getGroupStatus() == 1) {
goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.FORMED_INTO_A_GROUP);
}
- if (goodsGroupPurchaseeVO1.getStartStatus().getCode() == 1) {
- if (one1.getGroupStatus() == 2) {
- goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.TO_FORM_A_GROUP);
- }
- } else {
if (one1.getGroupStatus() == 2) {
goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
}
- }
-
-
+ }else{
+ goodsGroupPurchaseeVO1.setGroupStatus(data.getGroupStatus());
}
+ }
+
@@ -1655,6 +1664,12 @@
updMembeOneDTO.setTotalPoints(Math.max(member.getTotalPoints() - order.getPoints(), 0));
memberClient.updMembeOne(updMembeOneDTO, SecurityConstants.INNER);
}
+ if (Objects.nonNull(order.getCouponId())) {
+ CouponMemberDTO dto = new CouponMemberDTO();
+ dto.setId(order.getCouponId());
+ dto.setCouponStatus(CouponUseEnum.UNUSED.getCode());
+ promotionClient.updCouponMember(dto, SecurityConstants.INNER);
+ }
}
private boolean handleRefund(PaymentMethodEnum paymentMethod, Paylog paylog, String orderNo) {
--
Gitblit v1.7.1