添加测试日志

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

@@ -19,7 +19,7 @@ import java.util.List;
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
 @Data
-public class CheckCartRequest {
+public class  CheckCartRequest {
     private List<CartGoods> cartGoodsList;
     private String partnerId;
     private String storeId;

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/ShoppingCartBaseService.java

@@ -12,6 +12,7 @@ import com.freemud.application.sdk.api.couponcenter.online.request.PartnerReques
 import com.freemud.application.sdk.api.couponcenter.online.response.CouponDetailResponse;
 import com.freemud.application.sdk.api.couponcenter.online.service.FMActiveSdkService;
 import com.freemud.application.sdk.api.couponcenter.online.service.OnlineCouponSdkService;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
@@ -42,6 +43,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.core.log.LogFormatUtils;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -190,6 +192,7 @@ public interface ShoppingCartBaseService {
         try {
             ValidateShopProductRequest validateShopProductRequest = shoppingCartAdapter.getValidateShopProductRequest(checkCartRequest);
             com.freemud.application.sdk.api.base.BaseResponse<ValiadShopProductResponse> valiadResponse = productService.validateShopProduct(validateShopProductRequest);
+            ApiLog.info("替换购物车数据检验结果 1 -->", validateShopProductRequest,valiadResponse);
             if (valiadResponse == null || !CartResponseConstant.SUCCESS.getCode().equals(valiadResponse.getCode()) || valiadResponse.getData()==null) {
                 checkCartRequest.getCartGoodsList().clear();
                 checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
@@ -239,6 +242,7 @@ public interface ShoppingCartBaseService {
                 checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
                 checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_MATERIAL_ERROR);
             }
+            ApiLog.info("替换购物车数据检验结果 2 -->", null,checkCartRequest);
             return CartResponseUtil.success(checkCartRequest);
         } catch (Exception e) {
             ErrorLog.printErrorLog("assortment-shoppingcart-sdk", checkCartRequest.getTrackingNo(), e.getMessage(), "checkAllCartGoods", checkCartRequest, e, Level.ERROR);

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

@@ -242,6 +242,7 @@ public class AssortmentSdkService {
         checkCartRequest.setMenuType(BusinessTypeEnum.getByType(menuType).getCode());
         BaseResponse<CheckCartRequest> baseResponse ;
         baseResponse= shoppingCartService.checkAllCartGoodsNew(checkCartRequest);
+        LogUtil.info("替换购物车数据检验结果 final", checkCartRequest,baseResponse);
         if (baseResponse == null) {
             return null;
         }

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

@@ -2955,6 +2955,9 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         if (CollectionUtils.isEmpty(excludeGoods)) {
             return ResponseUtil.error(ResponseResult.SHOPPING_CART_REPLACE_GOODS_AND_CLEAR);
         }
+        //testDemo(excludeGoods,replaceGoodsRequestVo,userId);
+
+
         boolean fullReplace = true;
         if (excludeGoods.size()!=allCartGoodsList.size()) {
             fullReplace = false;
@@ -3027,6 +3030,74 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         return ResponseUtil.success();
     }
 
+    private void testDemo(List<CartGoods> excludeGoods, ShopGoodsReplaceVo replaceGoodsRequestVo, String userId ) {
+        String partnerId = replaceGoodsRequestVo.getPartnerId();
+        String storeId = replaceGoodsRequestVo.getShopId();
+        String appId = replaceGoodsRequestVo.getAppId();
+        String menuType = replaceGoodsRequestVo.getMenuType();
+        Integer orderType = replaceGoodsRequestVo.getOrderType();
+        String receiveId = replaceGoodsRequestVo.getReceiveId();
+        excludeGoods.forEach(oldCartGoods -> {
+            String spuId = oldCartGoods.getSpuId();
+            String skuId = oldCartGoods.getSkuId();
+            String goodsId = StringUtils.isEmpty(skuId) ? spuId : skuId;
+//            String tableNumber = cartGoods.getTableNumber();
+            Integer qty = oldCartGoods.getQty();
+            CartGoods cartGoods = new CartGoods();
+            cartGoods.setGoodsId(goodsId);
+            cartGoods.setAddCartTime(System.currentTimeMillis());
+            cartGoods.setSpuId(spuId);
+            cartGoods.setSkuId(skuId);
+            cartGoods.setQty(qty);
+            Integer goodsType = StringUtils.isEmpty(skuId)||ObjectUtils.equals(spuId,skuId) ? GoodsTypeEnum.SPU_GOODS.getGoodsType() : GoodsTypeEnum.SKU_GOODS.getGoodsType();
+            cartGoods.setGoodsType(goodsType);
+            cartGoods.setExtra(oldCartGoods.getExtra());
+            cartGoods.setNodeId(oldCartGoods.getNodeId());
+            cartGoods.setCategoryName(oldCartGoods.getCategoryName());
+            List<CartGoods.ComboxGoods> productComboList = new ArrayList<>();
+            List<CartGoods.ComboxGoods> productGroupList = new ArrayList<>();
+            List<CartGoods.MaterialGoods> materialGoodsList = new ArrayList<>();
+            //套餐
+            if (CollectionUtils.isNotEmpty(oldCartGoods.getProductComboList())) {
+                for (CartGoods.ComboxGoods vo : oldCartGoods.getProductComboList()) {
+                    CartGoods.ComboxGoods productCombox = new CartGoods.ComboxGoods();
+                    productCombox.setGoodsId(vo.getSkuId());
+                    productCombox.setSkuId(vo.getSkuId());
+                    productCombox.setQty(vo.getQty());
+                    productCombox.setExtra(vo.getExtra());
+                    productComboList.add(productCombox);
+                }
+            }
+            //固定商品组
+            if (CollectionUtils.isNotEmpty(oldCartGoods.getProductGroupList())) {
+                for (CartGoods.ComboxGoods vo : oldCartGoods.getProductGroupList()) {
+                    CartGoods.ComboxGoods productCombox = new CartGoods.ComboxGoods();
+                    productCombox.setGoodsId(vo.getSkuId());
+                    productCombox.setSkuId(vo.getSkuId());
+                    productCombox.setQty(vo.getQty());
+                    productCombox.setExtra(vo.getExtra());
+                    productCombox.setProductGroupId(vo.getProductGroupId()==null ? null : vo.getProductGroupId());
+                    productGroupList.add(productCombox);
+                }
+            }
+            //加料商品集
+            if (CollectionUtils.isNotEmpty(oldCartGoods.getProductMaterialList())) {
+                for (CartGoods.MaterialGoods materialRequestVo : oldCartGoods.getProductMaterialList()) {
+                    CartGoods.MaterialGoods materialGoods = new CartGoods.MaterialGoods();
+                    materialGoods.setSpuId(materialRequestVo.getSpuId());
+                    materialGoods.setQty(materialRequestVo.getQty() == null ? 1 : materialRequestVo.getQty());
+                    materialGoodsList.add(materialGoods);
+                }
+            }
+            cartGoods.setProductComboList(productComboList);
+            cartGoods.setProductGroupList(productGroupList);
+            cartGoods.setProductMaterialList(materialGoodsList);
+
+
+
+        });
+    }
+
     private boolean updateCartGoodsLegal(List<CartGoods> excludeGoods, String userId, ShopGoodsReplaceVo replaceGoodsRequestVo, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo,boolean fullReplace) {
         //存储新添加的购物车信息
         List<CartGoods> nowCartGoodsList = new ArrayList<>();