zoujiajian 1 ano atrás
pai
commit
0afb47667e

+ 2 - 0
netflix-dao/src/main/java/com/cyksj/model/request/GroupsRelationRechargeReq.java

@@ -22,4 +22,6 @@ public class GroupsRelationRechargeReq {
 
 	@NotEmpty
 	private String accessToken;
+
+	private String password;
 }

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

@@ -183,11 +183,14 @@ public class GptRechargeServiceImpl implements GptRechargeService {
 				throw BusinessRuntimeException.getInstance("自动充值错误");
 			}
 			String taskId = result.getTaskId();
+			String password = req.getPassword();
 			relationMapper.update(null, Wrappers.lambdaUpdate(GroupsRelation.class)
 					//记录代充账号
 					.set(GroupsRelation::getAccount, rechargeAccount)
 					//记录操作人员
 					.set(cmsUser != null, GroupsRelation::getOperator, cmsUser.getNickname())
+					//密码
+					.set(StrUtil.isNotBlank(password), GroupsRelation::getPassword, password)
 					.set(GroupsRelation::getRechargeStatus, GroupsRelation.RechargeStatus.recharging)
 					.set(GroupsRelation::getCardKey, gptCardKey)
 					.set(GroupsRelation::getGptTaskId, taskId)

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

@@ -51,6 +51,7 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
+ * admin/用户代充值列表
  * @author chan
  * @date 2022/9/27 6:45 PM
  */
@@ -148,6 +149,7 @@ public class CmsGroupRelationController {
     public Result<String> updateRechargeStatus(@RequestBody GroupsRelationRechargeView rechargeView) {
         long adminId = StpUtil.getLoginIdAsLong();
         Long relationId = rechargeView.getRelationId();
+        String password = rechargeView.getPassword();
         GroupsRelation relation = groupsRelationMapper.selectById(relationId);
         Assert.notNull(relation, "代充车票不存在");
         if (relation.getRenewStatus() == null || relation.getRechargeStatus() == GroupsRelation.RechargeStatus.complete) {
@@ -163,6 +165,9 @@ public class CmsGroupRelationController {
         relation.setOperator(cmsUser.getNickname());
         //邀请制家庭组链接
         relation.setInviteLink(rechargeView.getInviteLink());
+        if (StrUtil.isNotEmpty(password)) {
+            relation.setPassword(password);
+        }
         OrderDon orderDon = null;
         if (rechargeStatus == GroupsRelation.RechargeStatus.complete) {
             relation.setSendTime(DateTime.now());