增加入参方便查日志

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/request/CheckCartRequest.java

@@ -27,5 +27,6 @@ public class CheckCartRequest {
     private Integer orderWay;
     private String trackingNo;
     private String tableNumber;
+    private String sessionId;
     private String menuType;
 }

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

@@ -512,6 +512,7 @@ public class ShoppingCartConvertAdapter {
         validateShopProductRequest.setPartnerId(checkCartRequest.getPartnerId());
         validateShopProductRequest.setStoreId(checkCartRequest.getStoreId());
         validateShopProductRequest.setProductTypeList(new ArrayList<>());
+        validateShopProductRequest.setSessionId(checkCartRequest.getSessionId());
         for (com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods cartGoods : checkCartRequest.getCartGoodsList()) {
             // 过滤非商品券商品
             if (cartGoods.getCartGoodsUid().startsWith(CommonsConstant.COUPON_PREFIX)) {

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/product/ValidateShopProductRequest.java

@@ -22,6 +22,7 @@ public class ValidateShopProductRequest {
     private String partnerId;
     private String storeId;
     private String channel;
+    private String sessionId;
     private List<ValidateShopProductType> productTypeList;
 
 }

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java

@@ -529,7 +529,7 @@ public class ShoppingCartMCoffeeServiceImpl {
 //        cartGoodsList = checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, cartGoodsList);
         List<CartGoods> temList = new ArrayList<>();
         for (CartGoods goods : cartGoodsList) {
-            temList.addAll(checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(goods)));
+            temList.addAll(checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(goods), sessionId));
         }
         cartGoodsList = temList;
 
@@ -600,7 +600,7 @@ public class ShoppingCartMCoffeeServiceImpl {
             // check购物车中所有商品
             List<CartGoods> temList = new ArrayList<>();
             for (CartGoods goods : cartGoodsList) {
-                temList.addAll(checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(goods)));
+                temList.addAll(checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(goods), sessionId));
             }
             cartGoodsList = temList;
             if (CollectionUtils.isNotEmpty(cartGoodsList)) {
@@ -982,13 +982,13 @@ public class ShoppingCartMCoffeeServiceImpl {
         if (requestVo.getOperationType() == ShoppingCartOperationType.CHECK.getCode()){
             // 新门店check购物车中所有商品
             for (CartGoods cartGoods : cartGoodsList) {
-                onlyCheckGoodsList.addAll(checkCartGoods(partnerId, toStoreId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(cartGoods)));
+                onlyCheckGoodsList.addAll(checkCartGoods(partnerId, toStoreId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(cartGoods), sessionId));
             }
         }else{
             // 新门店check购物车中所有商品
             List<CartGoods> temList = new ArrayList<>();
             for (CartGoods goods : cartGoodsList) {
-                temList.addAll(checkCartGoods(partnerId, toStoreId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(goods)));
+                temList.addAll(checkCartGoods(partnerId, toStoreId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(goods), sessionId));
             }
             cartGoodsList = temList;
         }
@@ -1010,7 +1010,7 @@ public class ShoppingCartMCoffeeServiceImpl {
                 // 新门店check购物车中所有商品
                 List<CartGoods> temList = new ArrayList<>();
                 for (CartGoods goods : cartGoodsList) {
-                    temList.addAll(checkCartGoods(partnerId, toStoreId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(goods)));
+                    temList.addAll(checkCartGoods(partnerId, toStoreId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(goods), sessionId));
                 }
                 cartGoodsList = temList;
 
@@ -1108,7 +1108,7 @@ public class ShoppingCartMCoffeeServiceImpl {
 //        cartGoodsList = checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, cartGoodsList);
         List<CartGoods> temList = new ArrayList<>();
         for (CartGoods goods : cartGoodsList) {
-            temList.addAll(checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(goods)));
+            temList.addAll(checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(goods), sessionId));
         }
         cartGoodsList = temList;
 
@@ -1348,16 +1348,16 @@ public class ShoppingCartMCoffeeServiceImpl {
      * 获取购物车商品,添加商品,校验商品合法性,合并商品行,重新set购物车信息到缓存中
      *
      * @param addCartGoods
-     * @param userId
+     * @param sessionId
      * @param shoppingCartGoodsResponseVo
      */
-    public List<CartGoods> updateCartGoodsLegal(String partnerId, String storeId, Integer orderType, String tableNumber, String menuType, String userId,
+    public List<CartGoods> updateCartGoodsLegal(String partnerId, String storeId, Integer orderType, String tableNumber, String menuType, String sessionId,
                                                 CartGoods addCartGoods, ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo, List<CartGoods> oldCartGoodsList) {
-        oldCartGoodsList = checkCartGoods(partnerId, storeId, orderType, menuType,shoppingCartGoodsResponseVo, oldCartGoodsList);
+        oldCartGoodsList = checkCartGoods(partnerId, storeId, orderType, menuType,shoppingCartGoodsResponseVo, oldCartGoodsList, sessionId);
         List<CartGoods> newCartGoods = new ArrayList<>();
         newCartGoods.add(addCartGoods);
         //加购商品校验
-        List<CartGoods> newCartGoodsList = checkCartGoods(partnerId, storeId, orderType, menuType,shoppingCartGoodsResponseVo, newCartGoods);
+        List<CartGoods> newCartGoodsList = checkCartGoods(partnerId, storeId, orderType, menuType,shoppingCartGoodsResponseVo, newCartGoods, sessionId);
         List<CartGoods> nowCartGoodsList = new ArrayList<>();
         if(CollectionUtils.isNotEmpty(oldCartGoodsList)){
             nowCartGoodsList.addAll(oldCartGoodsList);
@@ -1737,7 +1737,7 @@ public class ShoppingCartMCoffeeServiceImpl {
      * 购物车商品check，加购商品不在菜单不check
      */
     private List<CartGoods> checkCartGoods(String partnerId, String storeId, Integer orderType, String menuType,
-                                           ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo, List<CartGoods> cartGoodsList) {
+                                           ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo, List<CartGoods> cartGoodsList, String sessionId) {
 
         //筛选数量不为0商品
         cartGoodsList = cartGoodsList.stream().filter(cartGoods -> cartGoods.getQty() != 0).collect(Collectors.toList());
@@ -1751,7 +1751,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         if (CollectionUtils.isNotEmpty(checkGoods)) {
             //当商品全部添加完毕,校验购物车商品(是否合法,上下架,点餐方式,是否在当前菜单中...),并移除非法商品
             CheckCartRequest checkCartRequest = checkShoppingCartSdkForMCoffee(checkGoods, partnerId,
-                    storeId, shoppingCartGoodsResponseVo, orderType, "", menuType, shoppingCartBaseService);
+                    storeId, shoppingCartGoodsResponseVo, orderType, sessionId, menuType, shoppingCartBaseService);
             if (checkCartRequest.getShoppingCartGoodsResponseVo() != null) {
                 shoppingCartGoodsResponseVo.setToastMsg(checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg());
                 shoppingCartGoodsResponseVo.setChanged(checkCartRequest.getShoppingCartGoodsResponseVo().getChanged());
@@ -1866,14 +1866,14 @@ public class ShoppingCartMCoffeeServiceImpl {
      * @param orderType
      */
     public CheckCartRequest checkShoppingCartSdkForMCoffee(List<CartGoods> oldAllCartGoodsList, String partnerId, String storeId, ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo
-            , Integer orderType, String tableNumber, String menuType ,ShoppingCartBaseService shoppingCartService) {
+            , Integer orderType, String sessionId, String menuType ,ShoppingCartBaseService shoppingCartService) {
         CheckCartRequest checkCartRequest = new CheckCartRequest();
         checkCartRequest.setCartGoodsList(JSONArray.parseArray(JSONObject.toJSONString(oldAllCartGoodsList), com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.class));
         checkCartRequest.setOrderWay(orderType);
         checkCartRequest.setPartnerId(partnerId);
         checkCartRequest.setShoppingCartGoodsResponseVo(JSONObject.parseObject(JSONObject.toJSONString(shoppingCartGoodsResponseVo), com.freemud.sdk.api.assortment.shoppingcart.domain.ShoppingCartGoodsResponseVo.class));
         checkCartRequest.setStoreId(storeId);
-        checkCartRequest.setTableNumber(tableNumber);
+        checkCartRequest.setSessionId(sessionId);
         checkCartRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
         checkCartRequest.setMenuType(BusinessTypeEnum.getByType(menuType).getCode());
         BaseResponse<CheckCartRequest> baseResponse ;
@@ -2059,7 +2059,7 @@ public class ShoppingCartMCoffeeServiceImpl {
 //            cartGoodsList = checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, cartGoodsList);
             List<CartGoods> temList = new ArrayList<>();
             for (CartGoods goods : cartGoodsList) {
-                temList.addAll(checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(goods)));
+                temList.addAll(checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(goods), sessionId));
             }
             cartGoodsList = temList;
             // 重新存储最新购物车