zoujiajian пре 6 месеци
родитељ
комит
47b271e521

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

@@ -792,4 +792,9 @@ public interface Constant {
 	String GOODS_SUBSCRIBE_ALERT_EMAIL_MSG = "您好,您关注的%s已上线,登录网站https://nf.video/buy/%s 看看吧";
 
 	Long AF_DIAN_CHANNEL_ID = 6L;
+
+	/**
+	 * CHONG.AFDIAN 代充
+	 */
+	Long CHONG_AF_DIAN_CHANNEL_ID = 7L;
 }

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

@@ -24,6 +24,7 @@ import com.cyksj.server.recharge.dto.TaskSubmitResult;
 import com.cyksj.server.recharge.dto.TokenParseResult;
 import com.cyksj.service.chatgpt.GptUserRechargeRecordService;
 import com.cyksj.service.recharge.AfDianRechargeService;
+import com.cyksj.service.recharge.ChongAfDianRechargeService;
 import com.cyksj.service.recharge.GptRechargeCardKeyChannelService;
 import com.cyksj.service.user.UserBindRelationService;
 import lombok.RequiredArgsConstructor;
@@ -64,6 +65,8 @@ public class GptProxyRechargeServiceImpl implements GptProxyRechargeService {
 
 	private final AfDianRechargeService afDianRechargeService;
 
+	private final ChongAfDianRechargeService chongAfDianRechargeService;
+
 	private static final GlobalThreadPoolTaskExecutor TASK_EXECUTOR = GlobalThreadPoolTaskExecutor.getInstance();
 
 	private HttpRequest createBaseRequest(String url) {
@@ -180,6 +183,9 @@ public class GptProxyRechargeServiceImpl implements GptProxyRechargeService {
 	        if (gptRechargeCardKey.getChannelId() == Constant.AF_DIAN_CHANNEL_ID) {
 		        return afDianRechargeService.getTaskResult(relation);
 	        }
+			if (gptRechargeCardKey.getChannelId()==Constant.CHONG_AF_DIAN_CHANNEL_ID){
+				return chongAfDianRechargeService.getTaskResult(relation);
+			}
 	        String BASE_URL = gptRechargeCardKeyChannelService.getCardKeyDomain(cardKey);
 	        String url = BASE_URL + "/tasks/" + taskId;
             HttpResponse response = createBaseRequest(url)
@@ -321,6 +327,10 @@ public class GptProxyRechargeServiceImpl implements GptProxyRechargeService {
 			if (channelId == Constant.AF_DIAN_CHANNEL_ID) {
 				return afDianRechargeService.confirmRecharge(relation, gptCardKey, null);
 			}
+			//chong.afdian
+			if (channelId == Constant.CHONG_AF_DIAN_CHANNEL_ID) {
+				return chongAfDianRechargeService.confirmRecharge(relation, gptCardKey, null);
+			}
 			//校验卡密是否可用
 			CardKeyValidationResult cardKeyValidationResult = validateCardKey(gptCardKey);
 			if (!cardKeyValidationResult.getAvailable()) {

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

@@ -26,6 +26,7 @@ import com.cyksj.server.recharge.dto.TokenParseResult;
 import com.cyksj.service.chatgpt.GptUserRechargeRecordService;
 import com.cyksj.service.mange.gpt.GptRechargeService;
 import com.cyksj.service.recharge.AfDianRechargeService;
+import com.cyksj.service.recharge.ChongAfDianRechargeService;
 import com.cyksj.service.recharge.GptRechargeCardKeyChannelService;
 import com.cyksj.service.user.UserBindRelationService;
 import lombok.RequiredArgsConstructor;
@@ -72,6 +73,8 @@ public class GptRechargeServiceImpl implements GptRechargeService {
 
 	private final AfDianRechargeService afDianRechargeService;
 
+	private final ChongAfDianRechargeService chongAfDianRechargeService;
+
 	private static final GlobalThreadPoolTaskExecutor TASK_EXECUTOR = GlobalThreadPoolTaskExecutor.getInstance();
 
 
@@ -220,6 +223,11 @@ public class GptRechargeServiceImpl implements GptRechargeService {
 				relation.setCardKey(gptCardKey);
 				return afDianRechargeService.confirmRecharge(relation, gptCardKey, cmsUser);
 			}
+			if (gptRechargeCardKey.getChannelId() == Constant.CHONG_AF_DIAN_CHANNEL_ID) {
+				req.setCmsUser(cmsUser);
+				relation.setCardKey(gptCardKey);
+				return chongAfDianRechargeService.confirmRecharge(relation, gptCardKey, cmsUser);
+			}
 			//校验卡密是否可用
 			CardKeyValidationResult cardKeyValidationResult = validateCardKey(gptCardKey);
 			if (!cardKeyValidationResult.getAvailable()) {
@@ -267,6 +275,9 @@ public class GptRechargeServiceImpl implements GptRechargeService {
 			if (gptRechargeCardKey.getChannelId() == Constant.AF_DIAN_CHANNEL_ID) {
 				return afDianRechargeService.getTaskResult(relation);
 			}
+			if (gptRechargeCardKey.getChannelId() == Constant.CHONG_AF_DIAN_CHANNEL_ID) {
+				return chongAfDianRechargeService.getTaskResult(relation);
+			}
 			String BASE_URL = gptRechargeCardKeyChannelService.getCardKeyDomain(cardKey);
 			String url = BASE_URL + "/tasks/" + taskId;
 			HttpResponse response = createBaseRequest(url)