From ec020535e2ace50ecafb19720175f5dbd3da6e44 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Wed, 3 Nov 2021 15:06:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=9F=A5=E8=B4=AD=E7=89=A9=E8=BD=A6?=
 =?UTF-8?q?=E7=9A=84=E6=83=85=E6=99=AF=E4=B8=8B=EF=BC=8C=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6=E5=86=85=E5=AE=B9=E4=BA=92=E9=80=9A=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/cart/entity/enums/CartTypeEnum.java |  4 +++
 .../cart/entity/enums/TradeCacheEnum.java     | 30 -------------------
 .../order/cart/service/CartServiceImpl.java   | 17 ++++-------
 3 files changed, 9 insertions(+), 42 deletions(-)
 delete mode 100644 framework/src/main/java/cn/lili/modules/order/cart/entity/enums/TradeCacheEnum.java

diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/CartTypeEnum.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/CartTypeEnum.java
index 1f273a53..2a6073b7 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/CartTypeEnum.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/CartTypeEnum.java
@@ -33,4 +33,8 @@ public enum CartTypeEnum {
      */
     KANJIA;
 
+    public String getPrefix() {
+        return "{" + this.name() + "}_";
+    }
+
 }
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/TradeCacheEnum.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/TradeCacheEnum.java
deleted file mode 100644
index 3e26d466..00000000
--- a/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/TradeCacheEnum.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package cn.lili.modules.order.cart.entity.enums;
-
-/**
- * 交易缓存枚举
- *
- * @author Chopper
- * @since 2020-03-25 2:30 下午
- */
-public enum TradeCacheEnum {
-
-    //================交易=================
-
-    /**
-     * 拼团
-     */
-    PINTUAN,
-    /**
-     * 购物车原始数据
-     */
-    CART_DATA,
-    /**
-     * 立即购买购物车原始数据
-     */
-    BUY_NOW_CART_DATA;
-
-
-    public String getPrefix() {
-        return "{" + this.name() + "}_";
-    }
-}
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 52ef8c00..68a94a20 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
@@ -18,7 +18,6 @@ import cn.lili.modules.order.cart.entity.dto.MemberCouponDTO;
 import cn.lili.modules.order.cart.entity.dto.TradeDTO;
 import cn.lili.modules.order.cart.entity.enums.CartTypeEnum;
 import cn.lili.modules.order.cart.entity.enums.DeliveryMethodEnum;
-import cn.lili.modules.order.cart.entity.enums.TradeCacheEnum;
 import cn.lili.modules.order.cart.entity.vo.CartSkuVO;
 import cn.lili.modules.order.cart.entity.vo.CartVO;
 import cn.lili.modules.order.cart.entity.vo.TradeParams;
@@ -37,7 +36,6 @@ import cn.lili.modules.promotion.entity.vos.PointsGoodsVO;
 import cn.lili.modules.promotion.entity.vos.kanjia.KanjiaActivitySearchParams;
 import cn.lili.modules.promotion.service.*;
 import cn.lili.modules.search.entity.dos.EsGoodsIndex;
-import cn.lili.modules.search.service.EsGoodsIndexService;
 import cn.lili.modules.search.service.EsGoodsSearchService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
@@ -204,17 +202,12 @@ public class CartServiceImpl implements CartService {
      */
     private String getOriginKey(CartTypeEnum cartTypeEnum) {
 
-        String cacheKey = "";
-        //如果会员登录了，则要以会员id为key
-        AuthUser currentUser = UserContext.getCurrentUser();
-        if (cartTypeEnum.equals(CartTypeEnum.CART)) {
-            cacheKey = TradeCacheEnum.CART_DATA.getPrefix() + currentUser.getId();
-        } else if (cartTypeEnum.equals(CartTypeEnum.BUY_NOW)) {
-            cacheKey = TradeCacheEnum.BUY_NOW_CART_DATA.getPrefix() + currentUser.getId();
-        } else if (cartTypeEnum.equals(CartTypeEnum.PINTUAN)) {
-            cacheKey = TradeCacheEnum.PINTUAN.getPrefix() + currentUser.getId();
+        //缓存key，默认使用购物车
+        if (cartTypeEnum != null) {
+            AuthUser currentUser = UserContext.getCurrentUser();
+            return cartTypeEnum.getPrefix() + currentUser.getId();
         }
-        return cacheKey;
+        throw new ServiceException(ResultCode.ERROR);
     }
 
     @Override