Merge branch 'feature/20210519-v2.0.30-批量一键加购ID1029801-周晓航'

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/ShoppingCartAdapter.java

 package com.freemud.sdk.api.assortment.shoppingcart.adapter;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+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;
@@ -79,6 +81,7 @@ public class ShoppingCartAdapter {
             productType.setMemberDiscount(cartGoods.getMemberDiscount());
             validateShopProductRequest.getProductTypeList().add(productType);
         }
+        ApiLog.info("替换购物车数据检验结果 01 -->", validateShopProductRequest, JSON.toJSON(checkCartRequest.getCartGoodsList()));
         return validateShopProductRequest;
     }
 

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/controller/ShoppingCartController.java

@@ -255,4 +255,14 @@ public class ShoppingCartController {
     public BaseResponse getCartInfoByUser(@LogParams @RequestBody @Validated CouponAvailableRequestVo request) {
         return SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class).getCartInfoByUser(request);
     }
+
+    /**
+     * 【C端服务端】批量一键加购
+     * 替换老门店的商品到切换的门店下
+     */
+    @PostMapping(value = "/replaceGoodsByShop")
+    @LogIgnore(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},logMessage = "/replaceGoodsByShop")
+    public BaseResponse replaceGoodsByShop(@LogParams @RequestBody @Validated ShopGoodsReplaceVo request) {
+        return SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class).replaceGoodsByShop(request);
+    }
 }

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShopGoodsReplaceVo.java

+package cn.freemud.entities.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * @author : xh.Z
+ * @email : fisherman0510@163.com
+ * @Date : 2021/5/19 下午2:29
+ * @description : 老门店商品 替换到 新门店商品下的 vo对象
+ */
+@Data
+public class ShopGoodsReplaceVo extends BaseRequestVo {
+    /**
+     * 微信appId
+     */
+    @NotEmpty(message = "appId不能为空")
+    private String appId;
+
+    /**
+     * 购买类型 0=普通购买 1=立即购买 ，默认值为普通购买
+     */
+//    @ApiModelProperty(value = "购买类型 0=普通购买 1=立即购买 ，默认值为普通购买")
+//    private int buyType = 0;
+
+    /**
+     * 业务类型： 0 : 自提 1：外卖 2：微商城
+     */
+    private String menuType ;
+
+    // 我需要的字段----------
+    @NotEmpty(message = "oldShopId不能为空")
+    private String oldShopId;
+
+    /**
+     * 收货地址ID、svc卡支付外卖订单必传
+     */
+    private String receiveId;
+
+    // 测试的时候 使用
+    private Integer hook;
+}

shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

@@ -105,6 +105,8 @@ public enum ResponseResult {
     SHOPPING_CART_MATERIA_QTY_LIMIT_ERR("44038", "商品加料超过最大限制"),
     SHOPPING_CART_QUERY_DELIVERY_TEMPLATE_ERR("44039", "获取配送模板异常"),
     SHOPPING_CART_USER_HAVE_NO_COUPON("44039", "使用的商品券已失效,请重新下单"),
+    SHOPPING_CART_REPLACE_GOODS("44040", "原有购物车没有商品"),
+    SHOPPING_CART_REPLACE_GOODS_AND_CLEAR("44041", "因部分商品当前门店暂未售卖，将从购物车移除"),
 
     /**
      * 订单状态码