fix 排除直冲渠道

netflix-service/src/main/java/com/cyksj/server/recharge/impl/GptProxyRechargeServiceImpl.java

@@ -326,6 +326,7 @@ public class GptProxyRechargeServiceImpl implements GptProxyRechargeService {
 					.eq(GptRechargeCardKey::getType, gptRechargeCardKeyType)
 					.eq(GptRechargeCardKey::getStatus, Boolean.FALSE)
                     .eq(specificChannel != null, GptRechargeCardKey::getChannelId, specificChannel)
+                    .ne(specificChannel == null, GptRechargeCardKey::getChannelId, Constant.YEAR_AF_DIAN_CHANNEL_ID)
                     .last("order by channel_id desc, rand() limit 1"));
 			//季、年付卡密不存在 从月付代充卡密中获取
 			if (gptRechargeCardKey == null && gptRechargeCardKeyType == 1) {
@@ -333,6 +334,7 @@ public class GptProxyRechargeServiceImpl implements GptProxyRechargeService {
 						.eq(GptRechargeCardKey::getType, 0)
 						.eq(GptRechargeCardKey::getStatus, Boolean.FALSE)
                         .eq(specificChannel != null, GptRechargeCardKey::getChannelId, specificChannel)
+                        .ne(specificChannel == null, GptRechargeCardKey::getChannelId, Constant.YEAR_AF_DIAN_CHANNEL_ID)
                         .last("order by channel_id desc, rand() limit 1"));
 			}
 			if (gptRechargeCardKey == null) {

netflix-service/src/main/java/com/cyksj/service/mange/gpt/impl/GptRechargeServiceImpl.java

@@ -206,13 +206,15 @@ public class GptRechargeServiceImpl implements GptRechargeService {
 					.eq(GptRechargeCardKey::getStatus, Boolean.FALSE)
 					.eq(GptRechargeCardKey::getType, gptRechargeCardKeyType)
                     .eq(specificChannel != null, GptRechargeCardKey::getChannelId, specificChannel)
+                    .ne(specificChannel == null, GptRechargeCardKey::getChannelId, Constant.YEAR_AF_DIAN_CHANNEL_ID)
                     .last("order by channel_id desc, rand() limit 1"));
 			//季、年付卡密不存在 从月付代充卡密中获取
 			if (gptRechargeCardKey == null && gptRechargeCardKeyType == 1) {
-				gptRechargeCardKey = gptRechargeCardKeyMapper.selectOne(Wrappers.lambdaQuery(GptRechargeCardKey.class)
-						.eq(GptRechargeCardKey::getType, 0)
-						.eq(GptRechargeCardKey::getStatus, Boolean.FALSE)
+                gptRechargeCardKey = gptRechargeCardKeyMapper.selectOne(Wrappers.lambdaQuery(GptRechargeCardKey.class)
+                        .eq(GptRechargeCardKey::getType, 0)
+                        .eq(GptRechargeCardKey::getStatus, Boolean.FALSE)
                         .eq(specificChannel != null, GptRechargeCardKey::getChannelId, specificChannel)
+                        .ne(specificChannel == null, GptRechargeCardKey::getChannelId, Constant.YEAR_AF_DIAN_CHANNEL_ID)
                         .last("order by channel_id desc, rand() limit 1"));
 			}
 			if (gptRechargeCardKey == null) {