From 856aee6c186b7ea7113c12ebbc8904e80fbaa5cc Mon Sep 17 00:00:00 2001
From: chc <1501738723@qq.com>
Date: Fri, 3 Feb 2023 17:26:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=87=AA=E6=8F=90=E8=B4=AD?=
 =?UTF-8?q?=E7=89=A9=E8=BD=A6=E5=95=86=E5=93=81=E4=B8=8D=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/lili/modules/order/cart/entity/vo/CartSkuVO.java    | 7 +++++++
 .../java/cn/lili/modules/order/cart/entity/vo/CartVO.java  | 1 +
 .../lili/modules/order/cart/service/CartServiceImpl.java   | 7 +++----
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartSkuVO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartSkuVO.java
index 1dcffeeb..f05087fa 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartSkuVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartSkuVO.java
@@ -3,6 +3,7 @@ package cn.lili.modules.order.cart.entity.vo;
 import cn.lili.modules.distribution.entity.dos.DistributionGoods;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.order.cart.entity.enums.CartTypeEnum;
+import cn.lili.modules.order.cart.entity.enums.DeliveryMethodEnum;
 import cn.lili.modules.promotion.tools.PromotionTools;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -89,6 +90,12 @@ public class CartSkuVO extends CartBase implements Serializable {
     @ApiModelProperty(value = "购物车类型")
     private CartTypeEnum cartType;
 
+    /**
+     * @see DeliveryMethodEnum
+     */
+    @ApiModelProperty(value = "配送方式")
+    private String deliveryMethod;
+
     /**
      * 在构造器里初始化促销列表，规格列表
      */
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartVO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartVO.java
index 9da4da6a..e5ca96b6 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartVO.java
@@ -81,6 +81,7 @@ public class CartVO extends CartBase implements Serializable {
     public CartVO(CartSkuVO cartSkuVO) {
         this.setStoreId(cartSkuVO.getStoreId());
         this.setStoreName(cartSkuVO.getStoreName());
+        this.setDeliveryMethod(cartSkuVO.getDeliveryMethod());
         this.setSkuList(new ArrayList<>());
         this.setCouponList(new ArrayList<>());
         this.setGiftList(new ArrayList<>());
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java
index c0970787..82c1805c 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java
@@ -492,12 +492,11 @@ public class CartServiceImpl implements CartService {
         if (CharSequenceUtil.isNotEmpty(way)) {
             cartTypeEnum = CartTypeEnum.valueOf(way);
         }
-        TradeDTO tradeDTO = this.getCheckedTradeDTO(cartTypeEnum);
-        for (CartVO cartVO : tradeDTO.getCartList()) {
-            cartVO.setDeliveryMethod(DeliveryMethodEnum.valueOf(deliveryMethod).name());
+        TradeDTO tradeDTO = this.readDTO(cartTypeEnum);
+        for (CartSkuVO cartSkuVO : tradeDTO.getSkuList()) {
+            cartSkuVO.setDeliveryMethod(DeliveryMethodEnum.valueOf(deliveryMethod).name());
         }
         this.resetTradeDTO(tradeDTO);
-        TradeDTO neTradeDTO = (TradeDTO) cache.get(this.getOriginKey(cartTypeEnum));
     }
 
     /**