From eb6bec7e04ea5f67acf8d28ad444fe77eb97bddd Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Tue, 3 Dec 2024 17:42:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=81=E8=B4=A7=E5=9C=B0=E5=9D=80bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/service/impl/ShopUserCartServiceImpl.java | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/user/service/impl/ShopUserCartServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/user/service/impl/ShopUserCartServiceImpl.java
index 57e69cee..575a3d19 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/user/service/impl/ShopUserCartServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/user/service/impl/ShopUserCartServiceImpl.java
@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.suisung.mall.common.api.CommonResult;
 import com.suisung.mall.common.api.ResultCode;
 import com.suisung.mall.common.api.StateCode;
+import com.suisung.mall.common.constant.CommonConstant;
 import com.suisung.mall.common.domain.UserDto;
 import com.suisung.mall.common.exception.ApiException;
 import com.suisung.mall.common.exception.ApiUserException;
@@ -536,6 +537,14 @@ public class ShopUserCartServiceImpl extends BaseServiceImpl<ShopUserCartMapper,
         Integer is_delivery = getParameter("is_delivery", 1);
         Integer if_virtual = getParameter("if_virtual", 1);
         String code = getParameter("code");
+
+        // 配送方式：5-上门自提； 10-普通快递； 16-同城配送；
+        Integer delivery_type_id = getParameter("delivery_type_id", Integer.class);
+        if (delivery_type_id == null || delivery_type_id <= 0) {
+            // 默认同城配送
+            delivery_type_id = StateCode.DELIVERY_TYPE_SAME_CITY;
+        }
+
         if_chain = chain_id != null && chain_id != 0;
         Long product_id = null;
 
@@ -547,7 +556,6 @@ public class ShopUserCartServiceImpl extends BaseServiceImpl<ShopUserCartMapper,
             activity_rows = shopStoreActivityBaseService.getActivityFormatOne(activity_id, quantity);
         }
 
-
         if (StrUtil.isBlank(cart_id) || (ifcart != null && ifcart != 0)) {
             // 从购物车进来
             QueryWrapper<ShopUserCart> cartQueryWrapper = new QueryWrapper<>();
@@ -726,7 +734,7 @@ public class ShopUserCartServiceImpl extends BaseServiceImpl<ShopUserCartMapper,
             }
         }
 
-        // 收货人收货地址
+        // 选中一个收货人的收货地址
         deliveryAddressService.fixAddressData(address_row);
         if (CollUtil.isNotEmpty(address_row)) {
             Optional<Map> defaultOpl = address_row.stream().filter(s -> Convert.toBool(s.get("ud_is_default"), false)).findFirst();
@@ -737,6 +745,7 @@ public class ShopUserCartServiceImpl extends BaseServiceImpl<ShopUserCartMapper,
             }
         }
 
+        // 城市id
         Integer district_id = Convert.toInt(delivery_address_row.get("ud_city_id"));
         if (CollUtil.isNotEmpty(delivery_address_row) && CheckUtil.isNotEmpty(district_id)) {
             // 计算邮费情况
@@ -1032,7 +1041,6 @@ public class ShopUserCartServiceImpl extends BaseServiceImpl<ShopUserCartMapper,
             // }
 
             // 赠品只能选一个SKU
-
             if (Objects.equals(cart_type, CART_TYPE_GIFT)) {
                 cart.setItem_id(item_id);
                 if (CheckUtil.isNotEmpty(cart_quantity)) {