From 49ce3c40e520577a6e0297c0760a604f71d5fe79 Mon Sep 17 00:00:00 2001
From: xm <1350250847@qq.com>
Date: Wed, 10 Jun 2026 15:07:57 +0800
Subject: [PATCH] 1

---
 .../com/gxwebsoft/shop/service/OrderBusinessService.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java b/src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java
index 9c9548d..f3baa78 100644
--- a/src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java
+++ b/src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java
@@ -94,7 +94,9 @@ public class OrderBusinessService {
         ShopOrder shopOrder = buildShopOrder(request, loginUser);
 
         //3. 处理收货地址信息
-        processDeliveryAddress(shopOrder, request, loginUser);
+        if(!(shopOrder.getOrderType() != null && shopOrder.getOrderType() == 2)){
+            processDeliveryAddress(shopOrder, request, loginUser);
+        }
 
         //4. 下单时校验配送范围（电子围栏）
         validateDeliveryFenceIfNeeded(shopOrder, loginUser);
@@ -554,7 +556,9 @@ public class OrderBusinessService {
                 return;
             }
             // 5. 如果用户没有任何收货地址，抛出异常
-            throw new BusinessException("请先添加收货地址");
+            if(Arrays.asList(1, 3, 4).contains(shopOrder.getOrderType())){
+                throw new BusinessException("请先添加收货地址");
+            }
 
         } catch (BusinessException e) {
             throw e;