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 | 16 +++++++---------
1 files changed, 7 insertions(+), 9 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 3033b5b..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
@@ -789,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);
@@ -885,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());
@@ -1326,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());
@@ -1339,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());
}
+ }
+
--
Gitblit v1.7.1