fix 替换账号增加辅助邮箱、关联邮箱

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

@@ -149,6 +149,14 @@ public class GroupsTrips {
     @TableField(exist = false)
     private String actCode;
 
+    @DbField("a.email")
+    @TableField(exist = false)
+    private String email;
+
+    @DbField("a.relate_email")
+    @TableField(exist = false)
+    private String relateEmail;
+
     /**
      * 车队上是否有人
      */

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

@@ -33,6 +33,16 @@ public class ReplaceTripsAccountReq {
 	@NotNull(message = "账号起始时间不为空")
 	private Date startTime;
 
+	/**
+	 * 辅助邮箱
+	 */
+	private String email;
+
+	/**
+	 * 关联邮箱
+	 */
+	private String relateEmail;
+
 	@NotNull(message = "账号过期时间不为空")
 	private Date expiryTime;
 }

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

@@ -392,6 +392,8 @@ public class CmsGroupServiceImpl extends ServiceImpl<GroupsMapper,GroupsTrips> i
                 .set(Account::getAccount, account)
                 .set(Account::getPassword, password)
                 .set(Account::getRemark, remark)
+                .set(StrUtil.isNotBlank(req.getEmail()), Account::getEmail, req.getEmail())
+                .set(StrUtil.isNotBlank(req.getRelateEmail()), Account::getRelateEmail, req.getRelateEmail())
                 .set(Account::getStartTime, afterStartTime)
                 .set(Account::getExpiryTime, afterExpiryTime)
                 .set(Account::getGptRefreshToken, StrUtil.EMPTY)