添加灰度开关

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

@@ -75,7 +75,7 @@ public class ShoppingCartController {
     @ApiAnnotation(logMessage = "addGoods")
     @PostMapping(value = "/addGoods")
     public BaseResponse addGoods(@Validated @LogParams @RequestBody AddShoppingCartGoodsRequestVo request) {
-        if (SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class).grayPush(request.getPartnerId(), request.getShopId(), "2")){
+        if (SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class).newShoppingCartGray(request.getPartnerId(), request.getShopId())){
             Map<String, Object> requestMap = (Map<String, Object>) JSON.toJSON(request);
             return shoppingCartDemoController.addGoods(requestMap);
         } else {
@@ -89,7 +89,7 @@ public class ShoppingCartController {
     @ApiAnnotation(logMessage = "updateGoodsQty")
     @PostMapping(value = "/updateGoodsQty")
     public BaseResponse updateGoodsQty(@Validated @LogParams @RequestBody UpdateShoppingCartGoodsQtyRequestVo request) {
-        if (SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class).grayPush(request.getPartnerId(), request.getShopId(), "2")){
+        if (SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class).newShoppingCartGray(request.getPartnerId(), request.getShopId())){
             Map<String, Object> requestMap = (Map<String, Object>) JSON.toJSON(request);
             return shoppingCartDemoController.updateGoodsQty(requestMap);
         } else {

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

@@ -194,6 +194,9 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
     @Value("${saas.cart.sharing}")
     private String sharing;
 
+    @Value("${saas.cart.new.shopping.cart}")
+    private String newShoppingCart;
+
     @Autowired
     private ShoppingCartRelationFactory shoppingCartRelationFactory;
 
@@ -2168,6 +2171,42 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         return enable;
     }
 
+    /**
+     * 购物车重构开关
+     * @param partnerId
+     * @param storeId
+     * @return
+     */
+    public boolean newShoppingCartGray(String partnerId, String storeId) {
+
+        if (StringUtils.isBlank(newShoppingCart)) return false;
+        CalculateCenter center = JSON.parseObject(newShoppingCart, CalculateCenter.class);
+        Boolean enable = false;
+        if (!center.getEnable()) return false;
+        switch (center.getType()) {
+            case 2:
+                enable = true;
+                break;
+            case 1: {
+                //商户+门店级别
+                String real = partnerId.concat(storeId);
+                if (Arrays.asList(center.getGrayList().split(",")).contains(real)) {
+                    enable = true;
+                }
+                //商户级别
+                else if (Arrays.asList(center.getGrayList().split(",")).contains(partnerId)) {
+                    enable = true;
+                }
+            }
+        }
+        if (center.getEnable() && enable) {
+            enable = true;
+        }
+        return enable;
+    }
+
+
+
 
     /**
      * 查询生态配置限制加购开关与限制数量