fix 账号替换p2

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

@@ -26,8 +26,6 @@ public class GroupsTripsAccountReplaceRecord extends BaseEntity{
 
 	private Date oldExpiryTime;
 
-	private Long newAccountId;
-
 	private String newAccount;
 
 	private String newPassword;
@@ -36,5 +34,7 @@ public class GroupsTripsAccountReplaceRecord extends BaseEntity{
 
 	private Date newExpiryTime;
 
+	private String remark;
+
 	private String operator;
 }

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

@@ -5,6 +5,7 @@ import lombok.Setter;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.util.Date;
 
 /*
  *项目名: netflix
@@ -28,4 +29,10 @@ public class ReplaceTripsAccountReq {
 	private String password;
 
 	private String remark;
+
+	@NotNull(message = "账号起始时间不为空")
+	private Date startTime;
+
+	@NotNull(message = "账号过期时间不为空")
+	private Date expiryTime;
 }

netflix-service/src/main/java/com/cyksj/service/mange/group/CmsGroupServiceImpl.java

@@ -170,6 +170,8 @@ public class CmsGroupServiceImpl extends ServiceImpl<GroupsMapper,GroupsTrips> i
         String account = req.getAccount().trim();
         String password = req.getPassword().trim();
         String remark = req.getRemark();
+        Date afterStartTime = req.getStartTime();
+        Date afterExpiryTime = req.getExpiryTime();
         GroupsAccountView groupsAccountView = beanSearcher.searchFirst(GroupsAccountView.class, MapUtils.builder()
                 .field(GroupsAccountView::getGroupsId, groupsId)
                 .build());
@@ -189,24 +191,15 @@ public class CmsGroupServiceImpl extends ServiceImpl<GroupsMapper,GroupsTrips> i
                 throw BusinessRuntimeException.getInstance("该平台下已生成该账号");
             }
         }
-        //新增账号
-        Account replace = new Account();
-        replace.setAccount(account);
-        replace.setPassword(password);
-        replace.setGoodsId(goodsId);
 
-        replace.setStartTime(groupsAccountView.getStartTime());
-        replace.setExpiryTime(groupsAccountView.getExpiryTime());
-        replace.setRemark(remark);
-        accountMapper.insert(replace);
-
-        //替换车队账号
-        this.update(null, Wrappers.lambdaUpdate(GroupsTrips.class)
-                .set(GroupsTrips::getAccountId, replace.getId())
-                .eq(GroupsTrips::getId, groupsId));
-
-        //删除旧的账号
-        accountMapper.deleteById(accountId);
+        //替换账号
+        accountMapper.update(null, Wrappers.lambdaUpdate(Account.class)
+                .set(Account::getAccount, account)
+                .set(Account::getPassword, password)
+                .set(Account::getRemark, remark)
+                .set(Account::getStartTime, afterStartTime)
+                .set(Account::getExpiryTime, afterExpiryTime)
+                .eq(Account::getId, accountId));
 
         //保存替换记录
         GroupsTripsAccountReplaceRecord replaceRecord = new GroupsTripsAccountReplaceRecord();
@@ -220,11 +213,11 @@ public class CmsGroupServiceImpl extends ServiceImpl<GroupsMapper,GroupsTrips> i
         Long adminId = req.getAdminId();
         Optional.ofNullable(cmsUserMapper.selectById(adminId)).ifPresent(admin -> replaceRecord.setOperator(admin.getNickname()));
 
-        replaceRecord.setNewAccountId(replace.getId());
-        replaceRecord.setNewAccount(replace.getAccount());
-        replaceRecord.setNewPassword(replace.getPassword());
-        replaceRecord.setNewStartTime(replace.getStartTime());
-        replaceRecord.setNewExpiryTime(replace.getExpiryTime());
+        replaceRecord.setNewAccount(account);
+        replaceRecord.setNewPassword(password);
+        replaceRecord.setNewStartTime(afterStartTime);
+        replaceRecord.setNewExpiryTime(afterExpiryTime);
+        replaceRecord.setRemark(remark);
 
         replaceRecordMapper.insert(replaceRecord);