fix

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

@@ -27,4 +27,6 @@ public class GptUserRechargeNumRecord extends BaseEntity{
 	 * 次数 正为扣除 负为增加
 	 */
 	private Integer num;
+
+	private String remark;
 }

netflix-dao/src/main/java/com/cyksj/model/request/RechargeRemainNumReq.java

@@ -15,4 +15,6 @@ public class RechargeRemainNumReq {
 	private Long relationId;
 
 	private Integer num;
+
+	private String remark;
 }

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

@@ -358,7 +358,7 @@ public class GptProxyRechargeServiceImpl implements GptProxyRechargeService {
 						.eq(GroupsRelation::getRechargeStatus, GroupsRelation.RechargeStatus.recharging));
 				//记录代充记录
 				if (rechargeStatus == GroupsRelation.RechargeStatus.complete) {
-					gptUserRechargeRecordService.recordGptUserRechargeNum(relation.getUserId(), relation.getId(), relation.getAccount(), 1, null);
+					gptUserRechargeRecordService.recordGptUserRechargeNum(relation.getUserId(), relation.getId(), relation.getAccount(), 1, null, "自动代充");
 					//修改对应订单状态
 					if (gptRechargeCardKey != null) {
 						Long orderId = gptRechargeCardKey.getOrderId();

netflix-service/src/main/java/com/cyksj/service/chatgpt/GptUserRechargeRecordService.java

@@ -8,5 +8,5 @@ package com.cyksj.service.chatgpt;
  */
 public interface GptUserRechargeRecordService {
 
-	void recordGptUserRechargeNum(Long userId, Long relationId, String account, Integer num, String operator);
+	void recordGptUserRechargeNum(Long userId, Long relationId, String account, Integer num, String operator, String remark);
 }

netflix-service/src/main/java/com/cyksj/service/chatgpt/impl/GptUserRechargeRecordServiceImpl.java

@@ -18,8 +18,9 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class GptUserRechargeRecordServiceImpl implements GptUserRechargeRecordService {
 	private final GptUserRechargeNumRecordMapper gptUserRechargeNumRecordMapper;
+
 	@Override
-	public void recordGptUserRechargeNum(Long userId, Long relationId, String account, Integer num, String operator) {
+	public void recordGptUserRechargeNum(Long userId, Long relationId, String account, Integer num, String operator, String remark) {
 		//记录代充记录
 		GptUserRechargeNumRecord gptUserRechargeNumRecord = new GptUserRechargeNumRecord();
 		gptUserRechargeNumRecord.setUserId(userId);
@@ -27,6 +28,7 @@ public class GptUserRechargeRecordServiceImpl implements GptUserRechargeRecordSe
 		gptUserRechargeNumRecord.setAccount(account);
 		gptUserRechargeNumRecord.setNum(num);
 		gptUserRechargeNumRecord.setOperator(operator);
+		gptUserRechargeNumRecord.setRemark(remark);
 		gptUserRechargeNumRecordMapper.insert(gptUserRechargeNumRecord);
 	}
 }

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

@@ -263,7 +263,7 @@ public class GptRechargeServiceImpl implements GptRechargeService {
 			throw BusinessRuntimeException.getInstance("该笔订单号已导入");
 		}
 		Integer num = rechargeReq.getNum();
-		relation.setRechargeStatus(GroupsRelation.RechargeStatus.waiting);
+		relation.setRechargeStatus(GroupsRelation.RechargeStatus.complete);
 		GoodsDonSku sku = skuMapper.selectById(orderDon.getSkuId());
 		Integer months = sku.getMonths();
 		//总代充次数
@@ -277,6 +277,7 @@ public class GptRechargeServiceImpl implements GptRechargeService {
 		//代充账号设置
 		relation.setAccount(account.getAccount());
 		relation.setPassword(account.getPassword());
+		relation.setSubmitTime(DateTime.now());
 		relationMapper.updateById(relation);
 	}
 
@@ -430,7 +431,7 @@ public class GptRechargeServiceImpl implements GptRechargeService {
 						.eq(GroupsRelation::getRechargeStatus, GroupsRelation.RechargeStatus.recharging));
 				//记录代充记录
 				if (rechargeStatus == GroupsRelation.RechargeStatus.complete) {
-					gptUserRechargeRecordService.recordGptUserRechargeNum(relation.getUserId(), relation.getId(), relation.getAccount(), 1, relation.getOperator());
+					gptUserRechargeRecordService.recordGptUserRechargeNum(relation.getUserId(), relation.getId(), relation.getAccount(), 1, relation.getOperator(), "后台操作");
 				}
 			}
 		}

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -5193,7 +5193,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 						.eq(GroupsRelation::getRechargeRemainNum, rechargeRemainNum));
 				if (update == 1) {
 					//记录gpt代充记录
-					gptUserRechargeRecordService.recordGptUserRechargeNum(relation.getUserId(), relation.getId(), relation.getAccount(), addNum, "用户订单续费");
+					gptUserRechargeRecordService.recordGptUserRechargeNum(relation.getUserId(), relation.getId(), relation.getAccount(), addNum, null, "订单续费");
 				}
 			}
 		}

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

@@ -645,7 +645,7 @@ public class CmsOrderController {
 							throw BusinessRuntimeException.getInstance("更新用户代充剩余次数失败，请重试");
 						}
 						//记录gpt代充记录
-						gptUserRechargeRecordService.recordGptUserRechargeNum(relation.getUserId(), relation.getId(), relation.getAccount(), 1, cmsUser != null ? cmsUser.getNickname() : null);
+						gptUserRechargeRecordService.recordGptUserRechargeNum(relation.getUserId(), relation.getId(), relation.getAccount(), 1, cmsUser != null ? cmsUser.getNickname() : null, "客服手动充值");
 					}
 				}
 			}

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

@@ -214,7 +214,7 @@ public class CmsGroupRelationController {
                     throw BusinessRuntimeException.getInstance("更新用户代充剩余次数失败，请重试");
                 }
                 //记录gpt代充记录
-                gptUserRechargeRecordService.recordGptUserRechargeNum(relation.getUserId(), relation.getId(), relation.getAccount(), 1, cmsUser != null ? cmsUser.getNickname() : null);
+                gptUserRechargeRecordService.recordGptUserRechargeNum(relation.getUserId(), relation.getId(), relation.getAccount(), 1, cmsUser != null ? cmsUser.getNickname() : null, "客服手动充值");
             }
         }
         return GatewayResponse.SUCCESS.newBuilder().toResult("状态修改成功");
@@ -263,7 +263,7 @@ public class CmsGroupRelationController {
             }
             //记录gpt代充记录
             CmsUser cmsUser = cmsUserMapper.selectById(adminId);
-            gptUserRechargeRecordService.recordGptUserRechargeNum(relation.getUserId(), relation.getId(), relation.getAccount(), num, cmsUser != null ? cmsUser.getNickname() : null);
+            gptUserRechargeRecordService.recordGptUserRechargeNum(relation.getUserId(), relation.getId(), relation.getAccount(), num, cmsUser != null ? cmsUser.getNickname() : null, req.getRemark());
         }
         return GatewayResponse.SUCCESS.newBuilder().toResult();
     }