Commit eb8d4744 by ping.wu

删除saas.cart.sharing配置

parent 7e4d1eb0
...@@ -109,8 +109,7 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService { ...@@ -109,8 +109,7 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
private CalculationSharingValidatorService calculationSharingValidatorService; private CalculationSharingValidatorService calculationSharingValidatorService;
@Autowired @Autowired
private CalculationSharingEquallyService sharingEquallyService; private CalculationSharingEquallyService sharingEquallyService;
@Value("${saas.cart.sharing}")
private String sharing;
/** /**
* 从微信卡券向购物车中添加商品 * 从微信卡券向购物车中添加商品
*/ */
...@@ -990,37 +989,4 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService { ...@@ -990,37 +989,4 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
return deliveryFeeInfo; 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;
}
} }
...@@ -195,8 +195,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -195,8 +195,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
private static final String limitCartKey = "ecology:kgd:wxappconfig:open_platform_partner_wxapp_config:appkey_"; private static final String limitCartKey = "ecology:kgd:wxappconfig:open_platform_partner_wxapp_config:appkey_";
@Value("${saas.cart.sharing}") // @Value("${saas.cart.sharing}")
private String sharing; // private String sharing;
@Value("${saas.cart.sharing.new}") @Value("${saas.cart.sharing.new}")
private String newSharing; private String newSharing;
......
...@@ -310,7 +310,6 @@ macafe.pick.tag = 100%\u963F\u62C9\u6BD4\u5361\u5496\u5561\u8C46+100%\u9C9C\u716 ...@@ -310,7 +310,6 @@ macafe.pick.tag = 100%\u963F\u62C9\u6BD4\u5361\u5496\u5561\u8C46+100%\u9C9C\u716
mccafe.partner.id = 1206 mccafe.partner.id = 1206
saas.order.delivery.mcCafe.callBackUrl = https://saastestapi.sandload.cn/order-application-service/order/delivery/macCafeCallback 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.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 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 saas.paymentcenter.application.api.feign.url = http://multi-pay-center-api-koderover-dev-payment.api-ingress.sandload.cn
mccafe.universal.coupon.code = 242742645524569 mccafe.universal.coupon.code = 242742645524569
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment