From 933c5dd8ed6715290c6863a8a8d2797582f62af7 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 22 九月 2025 15:28:39 +0800
Subject: [PATCH] 调整订单页面,以及新增pvuv,订单统计接口

---
 framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleServiceImpl.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleServiceImpl.java
index 98bb2f9..9834813 100644
--- a/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleServiceImpl.java
@@ -14,6 +14,7 @@
 import cn.lili.common.utils.BeanUtil;
 import cn.lili.common.utils.CurrencyUtil;
 import cn.lili.common.utils.SnowFlake;
+import cn.lili.common.utils.StringUtils;
 import cn.lili.modules.order.aftersale.aop.AfterSaleLogPoint;
 import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
 import cn.lili.modules.order.aftersale.entity.dto.AfterSaleDTO;
@@ -155,7 +156,13 @@
             afterSaleApplyVO.setReturnGoods(false);
         } else {
             afterSaleApplyVO.setReturnMoney(true);
-            afterSaleApplyVO.setReturnGoods(true);
+
+            if(StringUtils.isNotBlank(order.getOrderStatus()) && DeliverStatusEnum.UNDELIVERED.name().equals(order.getOrderStatus())){
+                afterSaleApplyVO.setReturnGoods(false);
+            }else {
+                afterSaleApplyVO.setReturnGoods(true);
+            }
+
         }
 
         afterSaleApplyVO.setAccountType(order.getPaymentMethod());

--
Gitblit v1.8.0