zoujiajian 4 هفته پیش
والد
کامیت
9601475f3b

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

@@ -223,7 +223,7 @@ public class GptProxyRechargeServiceImpl implements GptProxyRechargeService {
             if (gptRechargeCardKey.getChannelId() == Constant.SC_CHANNEL_ID) {
                 return sancRechargeService.getTaskResult(relation);
             }
-            if (gptRechargeCardKey.getChannelId() == Constant.REDEEM_CLOUD_CHANNEL_ID) {
+            if (Constant.REDEEM_CLOUD_CHANNEL_ID.equals(gptRechargeCardKey.getChannelId())) {
                 return redeemCloudRechargeService.getTaskResult(relation);
             }
 	        String BASE_URL = gptRechargeCardKeyChannelService.getCardKeyDomain(cardKey);
@@ -441,7 +441,7 @@ public class GptProxyRechargeServiceImpl implements GptProxyRechargeService {
                 return guofenzaixianRechargeService.confirmRecharge(relation, gptCardKey, null);
             }
             //redeemcloud
-            if (channelId == Constant.REDEEM_CLOUD_CHANNEL_ID) {
+            if (Constant.REDEEM_CLOUD_CHANNEL_ID.equals(channelId)) {
                 return redeemCloudRechargeService.confirmRecharge(relation, gptCardKey, null);
             }
 			//校验卡密是否可用

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

@@ -299,7 +299,7 @@ public class GptRechargeServiceImpl implements GptRechargeService {
                 return guofenzaixianRechargeService.confirmRecharge(relation, gptCardKey, cmsUser);
             }
             //redeemcloud
-            if (gptRechargeCardKey.getChannelId() == Constant.REDEEM_CLOUD_CHANNEL_ID) {
+            if (Constant.REDEEM_CLOUD_CHANNEL_ID.equals(gptRechargeCardKey.getChannelId())) {
                 req.setCmsUser(cmsUser);
                 relation.setCardKey(gptCardKey);
                 return redeemCloudRechargeService.confirmRecharge(relation, gptCardKey, cmsUser);
@@ -375,7 +375,7 @@ public class GptRechargeServiceImpl implements GptRechargeService {
             if (gptRechargeCardKey.getChannelId() == Constant.SC_CHANNEL_ID) {
                 return sancRechargeService.getTaskResult(relation);
             }
-            if (gptRechargeCardKey.getChannelId() == Constant.REDEEM_CLOUD_CHANNEL_ID) {
+            if (Constant.REDEEM_CLOUD_CHANNEL_ID.equals(gptRechargeCardKey.getChannelId())) {
                 return redeemCloudRechargeService.getTaskResult(relation);
             }
 			String BASE_URL = gptRechargeCardKeyChannelService.getCardKeyDomain(cardKey);

+ 7 - 2
netflix-service/src/main/java/com/cyksj/service/recharge/impl/RedeemCloudRechargeServiceImpl.java

@@ -137,8 +137,13 @@ public class RedeemCloudRechargeServiceImpl implements RedeemCloudRechargeServic
     }
 
     private String buildExchangeBody(String baseUrl, String cardKey, String rechargePayload) throws Exception {
-        if (StrUtil.isBlank(rechargePayload) || !StrUtil.startWith(rechargePayload.trim(), "{")) {
-            throw BusinessRuntimeException.getInstance("redeemcloud提交任务需要完整session JSON");
+        if (StrUtil.isBlank(rechargePayload)) {
+            throw BusinessRuntimeException.getInstance("redeemcloud提交任务需要session");
+        }
+        if (!StrUtil.startWith(rechargePayload.trim(), "{")) {
+            JSONObject session = new JSONObject();
+            session.putOpt("accessToken", rechargePayload);
+            return verifyAccount(baseUrl, cardKey, session.toString()).toString();
         }
         JSONObject payload = JSONUtil.parseObj(rechargePayload);
         if (isExchangeBody(payload)) {