AI订单优先分配给崇宇

netflix-common/src/main/java/com/cyksj/common/constant/Constant.java

@@ -519,6 +519,11 @@ public interface Constant {
 	 */
 	String SY_SHOP_ID = "2021004146676727";
 
+	/**
+	 * 崇宇支付宝id
+	 */
+	String CY_SHOP_ID = "2021003173606268";
+
 	/**
 	 * 代充邀请制平台
 	 * 声破天 油管

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

@@ -1,5 +1,6 @@
 package com.cyksj.service.pay.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.RandomUtil;
@@ -219,14 +220,28 @@ public class AliPayCommonServiceImpl implements AliPayCommonService {
 		Integer aiCount = goodsDonCategoryRelateMapper.selectCount(Wrappers.lambdaQuery(GoodsDonCategoryRelate.class)
 				.eq(GoodsDonCategoryRelate::getCategory, 1)
 				.eq(GoodsDonCategoryRelate::getGoodsId, goodsId));
-		List<ZfbShopOrderDayLimit> orderDayLimits = zfbShopOrderDayLimitMapper.selectList(Wrappers.lambdaQuery(ZfbShopOrderDayLimit.class)
-				.le(ZfbShopOrderDayLimit::getHourStart, hour)
-				.ge(ZfbShopOrderDayLimit::getHourEnd, hour)
-				.gt(ZfbShopOrderDayLimit::getDayRemainOrders, 0)
-				.gt(ZfbShopOrderDayLimit::getHourRemainOrders, 0)
-				.eq(ZfbShopOrderDayLimit::getStatus, 1)
-				.in(ZfbShopOrderDayLimit::getScope, scope)
-				.ne(aiCount > 0, ZfbShopOrderDayLimit::getAppId, Constant.SY_SHOP_ID));
+		List<ZfbShopOrderDayLimit> orderDayLimits = null;
+		//Ai订单 优先分配给崇宇
+		if (aiCount > 0) {
+			orderDayLimits = zfbShopOrderDayLimitMapper.selectList(Wrappers.lambdaQuery(ZfbShopOrderDayLimit.class)
+					.le(ZfbShopOrderDayLimit::getHourStart, hour)
+					.ge(ZfbShopOrderDayLimit::getHourEnd, hour)
+					.gt(ZfbShopOrderDayLimit::getDayRemainOrders, 0)
+					.gt(ZfbShopOrderDayLimit::getHourRemainOrders, 0)
+					.eq(ZfbShopOrderDayLimit::getStatus, 1)
+					.in(ZfbShopOrderDayLimit::getScope, scope)
+					.eq(ZfbShopOrderDayLimit::getAppId, Constant.CY_SHOP_ID));
+		}
+		if (CollUtil.isEmpty(orderDayLimits)) {
+			orderDayLimits = zfbShopOrderDayLimitMapper.selectList(Wrappers.lambdaQuery(ZfbShopOrderDayLimit.class)
+					.le(ZfbShopOrderDayLimit::getHourStart, hour)
+					.ge(ZfbShopOrderDayLimit::getHourEnd, hour)
+					.gt(ZfbShopOrderDayLimit::getDayRemainOrders, 0)
+					.gt(ZfbShopOrderDayLimit::getHourRemainOrders, 0)
+					.eq(ZfbShopOrderDayLimit::getStatus, 1)
+					.in(ZfbShopOrderDayLimit::getScope, scope)
+					.ne(aiCount > 0, ZfbShopOrderDayLimit::getAppId, Constant.SY_SHOP_ID));
+		}
 		if (orderDayLimits.isEmpty()) {
 			return null;
 		}