新算价配置修改，未配置默认走新算价

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

@@ -198,6 +198,9 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
     @Value("${saas.cart.sharing}")
     private String sharing;
 
+    @Value("${saas.cart.sharing.new}")
+    private String newSharing;
+
     @Value("${saas.cart.new.shopping.cart}")
     private String newShoppingCart;
 
@@ -2680,33 +2683,33 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
      *
      * @param partnerId
      * @param storeId
-     * @return
+     * @return 返回是否是新算价
      */
     public boolean grayPush(String partnerId, String storeId, String version) {
 
-        if (StringUtils.isBlank(sharing)) return false;
-        CalculateCenter center = JSON.parseObject(sharing, CalculateCenter.class);
-        Boolean enable = false;
-        if (!center.getEnable()) return false;
+        if (StringUtils.isBlank(newSharing)) return true;
+        CalculateCenter center = JSON.parseObject(newSharing, CalculateCenter.class);
+        Boolean enable = true;
+//        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)) {
+                //商户+门店级别(新算价)
+                String partnerId_storeId= partnerId.concat(storeId);
+                if (Arrays.asList(center.getGrayList().split(",")).contains(partnerId_storeId)) {
                     enable = true;
                 }
-                //商户级别
+                //商户级别(老算价)
                 else if (Arrays.asList(center.getGrayList().split(",")).contains(partnerId)) {
-                    enable = true;
-                }
+                    enable = false;
                 }
             }
-        if (center.getEnable() && enable) {
-            enable = true;
         }
+//        if (center.getEnable() && enable) {
+//            enable = true;
+//        }
         return enable;
     }