fix 代充记录

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

@@ -415,6 +415,7 @@ public class GptProxyRechargeServiceImpl implements GptProxyRechargeService {
 					.set(GroupsRelation::getCardKey, gptCardKey)
 					.set(GroupsRelation::getGptToken, saveTokenJson)
 					.set(GroupsRelation::getGptTaskId, taskId)
+					.set(GroupsRelation::getOperator, null)
 					.eq(GroupsRelation::getId, relationId));
 			return taskId;
 		} finally {
@@ -494,7 +495,11 @@ public class GptProxyRechargeServiceImpl implements GptProxyRechargeService {
 						.eq(GroupsRelation::getRechargeStatus, GroupsRelation.RechargeStatus.recharging));
 				//记录代充记录
 				if (rechargeStatus == GroupsRelation.RechargeStatus.complete) {
-                    gptUserRechargeRecordService.recordGptUserRechargeNum(relation.getCardKey(), relation.getUserId(), relation.getId(), relation.getAccount(), -1, null, "自动代充");
+					String remark = "自动代充";
+					if (StrUtil.isNotBlank(relation.getOperator())) {
+						remark = "后台自动代充";
+					}
+					gptUserRechargeRecordService.recordGptUserRechargeNum(relation.getCardKey(), relation.getUserId(), relation.getId(), relation.getAccount(), -1, relation.getOperator(), remark);
 					//修改对应订单状态
 					if (gptRechargeCardKey != null) {
 						Long orderId = gptRechargeCardKey.getOrderId();

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

@@ -579,7 +579,11 @@ public class GptRechargeServiceImpl implements GptRechargeService {
 						.eq(GroupsRelation::getRechargeStatus, GroupsRelation.RechargeStatus.recharging));
 				//记录代充记录
 				if (rechargeStatus == GroupsRelation.RechargeStatus.complete) {
-                    gptUserRechargeRecordService.recordGptUserRechargeNum(relation.getCardKey(), relation.getUserId(), relation.getId(), relation.getAccount(), -1, relation.getOperator(), "后台自动代充");
+					String remark = "自动代充";
+					if (StrUtil.isNotBlank(relation.getOperator())) {
+						remark = "后台自动代充";
+					}
+                    gptUserRechargeRecordService.recordGptUserRechargeNum(relation.getCardKey(), relation.getUserId(), relation.getId(), relation.getAccount(), -1, relation.getOperator(), remark);
 				}
 			}
 		}