Merge branches 'feature/20211103_取消支付冲正库存幂等_wuping' and 'qa' of…

Merge branches 'feature/20211103_取消支付冲正库存幂等_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

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

@@ -109,8 +109,7 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
     private CalculationSharingValidatorService calculationSharingValidatorService;
     @Autowired
     private CalculationSharingEquallyService sharingEquallyService;
-    @Value("${saas.cart.sharing}")
-    private String sharing;
+
     /**
      * 从微信卡券向购物车中添加商品
      */
@@ -995,37 +994,4 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
         return deliveryFeeInfo;
     }
 
-    /**
-     * @param partnerId
-     * @param storeId
-     * @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;
-        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;
-    }
-
 }

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

@@ -195,8 +195,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
     private static final String limitCartKey = "ecology:kgd:wxappconfig:open_platform_partner_wxapp_config:appkey_";
 
-    @Value("${saas.cart.sharing}")
-    private String sharing;
+//    @Value("${saas.cart.sharing}")
+//    private String sharing;
 
     @Value("${saas.cart.sharing.new}")
     private String newSharing;

shopping-cart-application-service/src/main/resources/application-local.properties

@@ -310,7 +310,6 @@ macafe.pick.tag = 100%\u963F\u62C9\u6BD4\u5361\u5496\u5561\u8C46+100%\u9C9C\u716
 mccafe.partner.id = 1206
 saas.order.delivery.mcCafe.callBackUrl = https://saastestapi.sandload.cn/order-application-service/order/delivery/macCafeCallback
 saas.payment-center.feign.url = http://payment-center-api-koderover-dev-payment.api-ingress.sandload.cn/
-saas.cart.sharing = { "type": 1, "grayList": "2399321123,2399716001,1516,1864XZ0003,18648899", "enable": false }
 aas.paymentcenter.application.api.feign.url = http://payment-center-application-api-koderover-dev-payment.api-ingress.sandload.cn
 saas.paymentcenter.application.api.feign.url = http://multi-pay-center-api-koderover-dev-payment.api-ingress.sandload.cn
 mccafe.universal.coupon.code = 242742645524569