fix 支付限制

netflix-service/src/main/java/com/cyksj/service/pay/impl/AliPayCommonServiceImpl.java

@@ -126,22 +126,24 @@ public class AliPayCommonServiceImpl implements AliPayCommonService {
 		Long orderId = re.getOrderId();
 		String returnUrl = re.getReturnUrl();
 		OrderDon orderDon = orderDonMapper.selectById(orderId);
-		String appId = null;
-		if (orderDon.getPopularizeId() != null) {
-			ShopConfig shopConfig = shopConfigMapper.getByChannelPopularizeId(orderDon.getPopularizeId(), "zfb");
-			if (shopConfig != null) {
-				appId = shopConfig.getAppId();
-			}
-		}
-		//排除推广链接
+		String appId = orderDon.getShopId();
 		if (StrUtil.isEmpty(appId)) {
-			//获取每日订单限制 支付宝商户
-			ZfbShopOrderDayLimit dayLimit = getZfbShopOrdersDayLimit(orderDon.getGoodsId());
-			if (dayLimit == null) {
-				//获取支付宝默认商户
-				appId = sysConfigService.getDefaultShopConfigByType("zfb");
-			} else {
-				appId = dayLimit.getAppId();
+			if (orderDon.getPopularizeId() != null) {
+				ShopConfig shopConfig = shopConfigMapper.getByChannelPopularizeId(orderDon.getPopularizeId(), "zfb");
+				if (shopConfig != null) {
+					appId = shopConfig.getAppId();
+				}
+			}
+			//排除推广链接
+			if (StrUtil.isEmpty(appId)) {
+				//获取每日订单限制 支付宝商户
+				ZfbShopOrderDayLimit dayLimit = getZfbShopOrdersDayLimit(orderDon.getGoodsId());
+				if (dayLimit == null) {
+					//获取支付宝默认商户
+					appId = sysConfigService.getDefaultShopConfigByType("zfb");
+				} else {
+					appId = dayLimit.getAppId();
+				}
 			}
 		}
 		if (OrderDon.Type.ALI_PAY != orderDon.getType()) {