|
|
@@ -145,7 +145,7 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
|
|
|
//获取最新的claude code user
|
|
|
claudeCodeUser = claudeCodeUserMapper.selectOne(Wrappers.lambdaQuery(ClaudeCodeUser.class).eq(ClaudeCodeUser::getRelationId, relationId).last("limit 1"));
|
|
|
//生成claude code或更新用户套餐
|
|
|
- ClaudeCodeResp codeUserPackage = createOrUpdateClaudeCodeUserPackage(relation.getUserId(), claudeCodeUser.getPlanName(), claudeCodeUser.getCodePoints(), claudeCodeUser.getCodeCreditRecovery(), relation.getStartTime(), claudeCodeUser.getExpiryTime(), sku);
|
|
|
+ ClaudeCodeResp codeUserPackage = createOrUpdateClaudeCodeUserPackage(relation.getUserId(), claudeCodeUser.getPlanName(), claudeCodeUser.getCodePoints(), claudeCodeUser.getCodeCreditRecovery(), claudeCodeUser.getExpiryTime(), sku);
|
|
|
if (!Constant.SUCCESS.equals(codeUserPackage.getMessage())) {
|
|
|
//重试更新code userInfo数据
|
|
|
setClaudeCodeUserRetryUpdateInfo(relationId);
|
|
|
@@ -362,8 +362,7 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
|
|
|
//是否需要重试更新 cladueCode userInfo信息
|
|
|
if (claudeCodeUser.getIsRetry()) {
|
|
|
try {
|
|
|
- GroupsRelation relation = relationMapper.selectById(claudeCodeUser.getRelationId());
|
|
|
- ClaudeCodeResp codeUserPackage = createOrUpdateClaudeCodeUserPackage(claudeCodeUser.getUserId(), claudeCodeUser.getPlanName(), claudeCodeUser.getCodePoints(), claudeCodeUser.getCodeCreditRecovery(), relation.getStartTime(), claudeCodeUser.getExpiryTime(), sku);
|
|
|
+ ClaudeCodeResp codeUserPackage = createOrUpdateClaudeCodeUserPackage(claudeCodeUser.getUserId(), claudeCodeUser.getPlanName(), claudeCodeUser.getCodePoints(), claudeCodeUser.getCodeCreditRecovery(), claudeCodeUser.getExpiryTime(), sku);
|
|
|
if (!Constant.SUCCESS.equals(codeUserPackage.getMessage())) {
|
|
|
claudeCodeUser.setIsRetry(Boolean.TRUE);
|
|
|
claudeCodeUserMapper.updateById(claudeCodeUser);
|
|
|
@@ -390,7 +389,7 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
|
|
|
.openaiQuota(codexUser != null ? codexUser.getOpenaiQuota() : null)
|
|
|
.build();
|
|
|
}
|
|
|
- public ClaudeCodeResp createOrUpdateClaudeCodeUserPackage(Long userId, String planName, Integer codePoints, Integer codeCreditRecovery, Date startTime, Date expiryTime, GoodsDonSku sku) throws Exception {
|
|
|
+ public ClaudeCodeResp createOrUpdateClaudeCodeUserPackage(Long userId, String planName, Integer codePoints, Integer codeCreditRecovery, Date expiryTime, GoodsDonSku sku) throws Exception {
|
|
|
Map<String, Object> parmas = new HashMap<>();
|
|
|
parmas.put("plan_name", planName.replaceAll(";", ""));
|
|
|
parmas.put("credit_limit", codePoints);
|
|
|
@@ -399,8 +398,7 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
|
|
|
parmas.put("openai_daily_limit", sku.getOpenaiDailyLimit());
|
|
|
parmas.put("openai_quota", sku.getOpenaiQuota());
|
|
|
}
|
|
|
- parmas.put("start_date", DateUtil.format(startTime, "yyyy-MM-dd HH:mm:ss"));
|
|
|
- parmas.put("end_date", DateUtil.format(expiryTime, "yyyy-MM-dd HH:mm:ss"));
|
|
|
+ parmas.put("expire_time", DateUtil.format(expiryTime, "yyyy-MM-dd HH:mm:ss"));
|
|
|
String planUrl = String.format(Constant.CLAUDE_CODE_API_PREFIX + "api/users/%s/plan", userId);
|
|
|
ClaudeCodeResp claudeCodeResp = executeClaudeCodePostApi(planUrl, Jsons.toJson(parmas));
|
|
|
if (!Constant.SUCCESS.equals(claudeCodeResp.getMessage())) {
|
|
|
@@ -436,8 +434,7 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
|
|
|
@Override
|
|
|
public void updateClaudeCodeUserPackageInfo(ClaudeCodeUser claudeCodeUser, Date expiryTime, GoodsDonSku sku) {
|
|
|
try {
|
|
|
- GroupsRelation relation = relationMapper.selectById(claudeCodeUser.getRelationId());
|
|
|
- ClaudeCodeResp codeUserPackage = createOrUpdateClaudeCodeUserPackage(claudeCodeUser.getUserId(), claudeCodeUser.getPlanName(), claudeCodeUser.getCodePoints(), claudeCodeUser.getCodeCreditRecovery(), relation.getStartTime(), expiryTime, sku);
|
|
|
+ ClaudeCodeResp codeUserPackage = createOrUpdateClaudeCodeUserPackage(claudeCodeUser.getUserId(), claudeCodeUser.getPlanName(), claudeCodeUser.getCodePoints(), claudeCodeUser.getCodeCreditRecovery(), expiryTime, sku);
|
|
|
if (!Constant.SUCCESS.equals(codeUserPackage.getMessage())) {
|
|
|
//重试标记
|
|
|
claudeCodeUser.setIsRetry(Boolean.TRUE);
|
zoujiajian