Merge branch 'feature/xukang_20210517_麦咖啡EVM券'

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

@@ -22,6 +22,7 @@ import cn.freemud.enums.ActivityTypeEnum;
 import cn.freemud.enums.GoodsTypeEnum;
 import cn.freemud.enums.ProductType;
 import cn.freemud.utils.BeanUtil;
+import cn.freemud.utils.ExceptionUtils;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
@@ -1072,20 +1073,11 @@ public class ShoppingCartConvertAdapter {
             // todo 设置加料
             this.checkMaterialProductForMCoffee(cartGoods, spuProduct);
         } catch (Exception ex) {
-            log.error("updateCartGoodsInfoForMCoffee_Error {} ", getExceptionInfo(ex));
+            log.error("updateCartGoodsInfoForMCoffee_Error {} ", ExceptionUtils.getExceptionInfo(ex));
             cartGoods.setCartGoodsUid(null);
         }
     }
 
-    private String getExceptionInfo(Exception e) {
-        StringBuilder sb = new StringBuilder();
-        StackTraceElement[] trace = e.getStackTrace();
-        for (StackTraceElement traceElement : trace) {
-            sb.append("\tat " + traceElement);
-        }
-        return sb.toString();
-    }
-
 
     private void updateComboxGoodsInfoFor(com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.ComboxGoods comboxGoods, ProductTypeBeanDTO productBeanDTO, boolean isComboxGoods) {
         if(CollectionUtils.isEmpty(productBeanDTO.getSkuList())){

shopping-cart-application-service/src/main/java/cn/freemud/utils/ExceptionUtils.java

+package cn.freemud.utils;
+
+public class ExceptionUtils {
+
+    public static String getExceptionInfo(Exception e) {
+        StringBuilder sb = new StringBuilder();
+        StackTraceElement[] trace = e.getStackTrace();
+        for (StackTraceElement traceElement : trace) {
+            sb.append("\tat " + traceElement);
+        }
+        return sb.toString();
+    }
+
+}