重构

shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartController.java

@@ -13,16 +13,20 @@
 package cn.freemud.controller;
 
 import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.demo.controller.ShoppingCartDemoController;
 import cn.freemud.entities.dto.GetMemberInfoRequestDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.OrderChannelType;
 import cn.freemud.enums.ResponseResult;
+import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.ShoppingCartNewService;
 import cn.freemud.service.impl.ShoppingCartMallServiceImpl;
 import cn.freemud.service.impl.ShoppingCartMealServiceImpl;
 import cn.freemud.service.impl.ShoppingCartNewServiceImpl;
 import cn.freemud.service.impl.ShoppingCartToolsServiceImpl;
+import cn.freemud.utils.BeanUtil;
 import cn.freemud.utils.ResponseUtil;
+import com.alibaba.fastjson.JSON;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
 import com.freemud.api.assortment.datamanager.enums.IappIdType;
 import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
@@ -30,6 +34,7 @@ import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
 import com.freemud.application.sdk.api.log.ApiAnnotation;
 import com.freemud.application.sdk.api.log.LogParams;
 import io.swagger.annotations.Api;
+import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +45,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Map;
+
 @RestController
 @RequestMapping(value = "/shoppingCart", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
 @Api(value = "购物车 controller", tags = {"购物车管理接口"})
@@ -49,6 +56,10 @@ public class ShoppingCartController {
     @Autowired
     private AssortmentCustomerInfoManager customerInfoManager;
 
+
+    @Autowired
+    private ShoppingCartDemoController shoppingCartDemoController;
+
     /**
      * 从微信卡券向购物车中添加商品
      */
@@ -64,7 +75,12 @@ public class ShoppingCartController {
     @ApiAnnotation(logMessage = "addGoods")
     @PostMapping(value = "/addGoods")
     public BaseResponse addGoods(@Validated @LogParams @RequestBody AddShoppingCartGoodsRequestVo request) {
-        return getInstanceByRequest(request).addGoods(request);
+        if (SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class).grayPush(request.getPartnerId(), request.getShopId(), "2")){
+            Map<String, Object> requestMap = (Map<String, Object>) JSON.toJSON(request);
+            return shoppingCartDemoController.addGoods(requestMap);
+        } else {
+            return getInstanceByRequest(request).addGoods(request);
+        }
     }
 
     /**
@@ -73,7 +89,12 @@ public class ShoppingCartController {
     @ApiAnnotation(logMessage = "updateGoodsQty")
     @PostMapping(value = "/updateGoodsQty")
     public BaseResponse updateGoodsQty(@Validated @LogParams @RequestBody UpdateShoppingCartGoodsQtyRequestVo request) {
-        return getInstanceByRequest(request).updateGoodsQty(request);
+        if (SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class).grayPush(request.getPartnerId(), request.getShopId(), "2")){
+            Map<String, Object> requestMap = (Map<String, Object>) JSON.toJSON(request);
+            return shoppingCartDemoController.updateGoodsQty(requestMap);
+        } else {
+            return getInstanceByRequest(request).updateGoodsQty(request);
+        }
     }
 
     /**