fix

netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -19,6 +19,7 @@ import com.cyksj.common.util.Jsons;
 import com.cyksj.common.util.StringUtil;
 import com.cyksj.enums.GatewayApiCode;
 import com.cyksj.mapper.*;
+import com.cyksj.mapper.codex.CodexUserRenewExpiryRecordMapper;
 import com.cyksj.mapper.manage.distribute.DistributeGeneralSkuRateMapper;
 import com.cyksj.mapper.manage.distribute.UserDistributeMapper;
 import com.cyksj.mapper.manage.distribute.UserPlatDistributeRateMapper;
@@ -47,6 +48,7 @@ import com.cyksj.service.chatgpt.ChatGptAccountService;
 import com.cyksj.service.chatgpt.ChatGptAuthService;
 import com.cyksj.service.claude.ClaudeCodeService;
 import com.cyksj.service.claude.ClaudeService;
+import com.cyksj.service.codex.CodexService;
 import com.cyksj.service.groups.GroupsFuncService;
 import com.cyksj.service.luma.LumaService;
 import com.cyksj.service.mail.CommonMailService;
@@ -213,6 +215,10 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 
 	private final NanoUserQuotaMapper nanoUserQuotaMapper;
 
+	private final CodexService codexService;
+
+	private final CodexUserRenewExpiryRecordMapper codexUserRenewExpiryRecordMapper;
+
 	private final AccountNetflixFrozenTicketReceivedRecordMapper accountNetflixFrozenTicketReceivedRecordMapper;
 
 	@Override
@@ -2044,12 +2050,6 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 					ticketRenewUpgradeView.setClaudeQuota(userInfo.getClaudeQuota());
 					ticketRenewUpgradeView.setIsRenewPackage(userInfo.getRenewSkuId() != null ? true : false);
 					ticketRenewUpgradeView.setHighestUsage(userInfo.getHighestUsage());
-					CodexUserInfoView codexUserInfo = userInfo.getCodexUserInfo();
-					if (codexUserInfo != null) {
-						ticketRenewUpgradeView.setCodexPlanName(codexUserInfo.getPlanName());
-						ticketRenewUpgradeView.setOpenaiDailyLimit(codexUserInfo.getOpenaiDailyLimit());
-						ticketRenewUpgradeView.setOpenaiQuota(codexUserInfo.getOpenaiQuota());
-					}
 					Long renewSkuId = userInfo.getRenewSkuId();
 					if (renewSkuId != null) {
 						GoodsDonSkuRenewView renewSku = beanSearcher.searchFirst(GoodsDonSkuRenewView.class, MapUtils.builder().field(GoodsDonSkuRenewView::getSkuId, renewSkuId).build());
@@ -2067,6 +2067,32 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 				} catch (Exception e) {
 				}
 			}
+
+			//codex
+			if (groupsRelationView.getGoodsId() == Constant.CODEX_GOODS_ID) {
+				try {
+					//codex用户镜像
+					CodexUserInfoView userInfo = codexService.getUserSubsInfo(userId);
+					ticketRenewUpgradeView.setOpenaiDailyLimit(userInfo.getOpenaiDailyLimit());
+					ticketRenewUpgradeView.setOpenaiQuota(userInfo.getOpenaiQuota());
+					ticketRenewUpgradeView.setIsRenewPackage(userInfo.getRenewSkuId() != null ? true : false);
+					Long renewSkuId = userInfo.getRenewSkuId();
+					if (renewSkuId != null) {
+						GoodsDonSkuRenewView renewSku = beanSearcher.searchFirst(GoodsDonSkuRenewView.class, MapUtils.builder().field(GoodsDonSkuRenewView::getSkuId, renewSkuId).build());
+						Optional.ofNullable(codexUserRenewExpiryRecordMapper.selectOne(Wrappers.lambdaQuery(CodexUserRenewExpiryRecord.class)
+								.eq(CodexUserRenewExpiryRecord::getOrderId, userInfo.getRenewOrderId())
+								.last("limit 1"))).ifPresent(e -> renewSku.setOriginalOrderId(e.getOrderId()));
+						if (lang != null && !StrUtil.equals(UserPageLanguage.Language.zh_CN.name(), lang)) {
+							String languageSpecVal = backInfoTranslationsFrontService.getLanguageSpecVal(renewSku.getSkuId(), lang);
+							if (StrUtil.isNotBlank(languageSpecVal)) {
+								renewSku.setSpecVal(languageSpecVal);
+							}
+						}
+						ticketRenewUpgradeView.setRenewSku(renewSku);
+					}
+				} catch (Exception e) {
+				}
+			}
 		}
 		return ticketRenewUpgradeView;
 	}