fix

netflix-dao/src/main/java/com/cyksj/model/entity/GroupsRelation.java

@@ -180,8 +180,8 @@ public class GroupsRelation extends BaseEntity {
         waiting("待充值"),
         complete("已完成"),
         error("账号错误"),
-        auto_error("自动充值错误"),
-        auto_recharge("自动充值中"),
+        recharge_error("充值错误"),
+        recharging("充值中"),
         ;
 
         private String desc;

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

@@ -193,8 +193,8 @@ public class GptProxyRechargeServiceImpl implements GptProxyRechargeService {
 		if (rechargeRemainNum == null || rechargeRemainNum <= 0) {
 			throw BusinessRuntimeException.getInstance("剩余可代充次数为0");
 		}
-		if (relation.getRechargeStatus() == GroupsRelation.RechargeStatus.auto_recharge) {
-			throw BusinessRuntimeException.getInstance("自动充值中");
+		if (relation.getRechargeStatus() == GroupsRelation.RechargeStatus.recharging) {
+			throw BusinessRuntimeException.getInstance("正在充值中");
 		}
 		int updateRemainNum = relationMapper.update(null, Wrappers.lambdaUpdate(GroupsRelation.class)
 				.set(GroupsRelation::getRechargeRemainNum, rechargeRemainNum - 1)
@@ -249,7 +249,7 @@ public class GptProxyRechargeServiceImpl implements GptProxyRechargeService {
 		}
 		relation.setAccount(rechargeAccount);
 		relation.setGptToken(accessToken);
-		relation.setRechargeStatus(GroupsRelation.RechargeStatus.auto_recharge);
+		relation.setRechargeStatus(GroupsRelation.RechargeStatus.recharging);
 		relation.setCardKey(gptCardKey);
 		String taskId = result.getTaskId();
 		relation.setGptTaskId(taskId);
@@ -262,7 +262,7 @@ public class GptProxyRechargeServiceImpl implements GptProxyRechargeService {
 	 */
 	public void setRechargeRelationStatusAutoError(GroupsRelation relation) {
 		TASK_EXECUTOR.execute(()->{
-			relation.setRechargeStatus(GroupsRelation.RechargeStatus.auto_error);
+			relation.setRechargeStatus(GroupsRelation.RechargeStatus.recharge_error);
 			relationMapper.updateById(relation);
 		});
 	}
@@ -275,10 +275,10 @@ public class GptProxyRechargeServiceImpl implements GptProxyRechargeService {
 			GroupsRelation relation = relationMapper.selectOne(Wrappers.lambdaQuery(GroupsRelation.class)
 					.eq(GroupsRelation::getGptTaskId, taskId)
 					.last("limit 1"));
-			if (relation != null && relation.getRechargeStatus() == GroupsRelation.RechargeStatus.auto_recharge) {
+			if (relation != null && relation.getRechargeStatus() == GroupsRelation.RechargeStatus.recharging) {
 				Integer rechargeRemainNum = relation.getRechargeRemainNum();
-				GroupsRelation.RechargeStatus rechargeStatus = "completed".equals(status) ? GroupsRelation.RechargeStatus.complete : GroupsRelation.RechargeStatus.auto_error;
-				if (rechargeStatus == GroupsRelation.RechargeStatus.auto_error) {
+				GroupsRelation.RechargeStatus rechargeStatus = "completed".equals(status) ? GroupsRelation.RechargeStatus.complete : GroupsRelation.RechargeStatus.recharge_error;
+				if (rechargeStatus == GroupsRelation.RechargeStatus.recharge_error) {
 					String cardKey = relation.getCardKey();
 					GptRechargeCardKey gptRechargeCardKey = gptRechargeCardKeyMapper.selectOne(Wrappers.lambdaQuery(GptRechargeCardKey.class)
 							.eq(GptRechargeCardKey::getCardKey, cardKey)
@@ -293,10 +293,10 @@ public class GptProxyRechargeServiceImpl implements GptProxyRechargeService {
 					}
 				}
 				relationMapper.update(null, Wrappers.lambdaUpdate(GroupsRelation.class)
-						.set(rechargeStatus == GroupsRelation.RechargeStatus.auto_error, GroupsRelation::getRechargeRemainNum, rechargeRemainNum + 1)
+						.set(rechargeStatus == GroupsRelation.RechargeStatus.recharge_error, GroupsRelation::getRechargeRemainNum, rechargeRemainNum + 1)
 						.set(GroupsRelation::getRechargeStatus, rechargeStatus)
 						.eq(GroupsRelation::getId, relation.getId())
-						.eq(GroupsRelation::getRechargeStatus, GroupsRelation.RechargeStatus.auto_recharge));
+						.eq(GroupsRelation::getRechargeStatus, GroupsRelation.RechargeStatus.recharging));
 			}
 		}
 	}

netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsOrderController.java

@@ -612,7 +612,7 @@ public class CmsOrderController {
 				.eq(GroupsRelation::getUserId, orderDon.getUserId())
 				.last("limit 1"))).ifPresent(relation->{
 			GroupsRelation.RechargeStatus rechargeStatus = relation.getRechargeStatus();
-			if (rechargeStatus != null && (rechargeStatus == GroupsRelation.RechargeStatus.waiting || rechargeStatus == GroupsRelation.RechargeStatus.auto_error)) {
+			if (rechargeStatus != null && (rechargeStatus == GroupsRelation.RechargeStatus.waiting || rechargeStatus == GroupsRelation.RechargeStatus.recharge_error)) {
 				relation.setRechargeStatus(GroupsRelation.RechargeStatus.complete);
 				if (cmsUser != null) {
 					relation.setOperator(cmsUser.getNickname());