Merge remote-tracking branch 'origin/master'

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

@@ -117,4 +117,15 @@ public class Account extends BaseEntity {
      * 关联邮箱 收取邮件
      */
     private String relateEmail;
+
+    /**
+     * 同户验证链接
+     */
+    private String verifyLink;
+
+    /**
+     * 是否外部采购
+     */
+    private Boolean outsidePurchase;
+
 }

netflix-dao/src/main/java/com/cyksj/model/excel/ExcelImportAccountData.java

@@ -30,4 +30,10 @@ public class ExcelImportAccountData {
 
 	@ExcelProperty("是否月抛")
 	private String isMonth;
+
+	@ExcelProperty("外部采购")
+	private String outsidePurchase;
+
+	@ExcelProperty("同户验证链接")
+	private String verifyLink;
 }

netflix-dao/src/main/java/com/cyksj/model/excel/ExcelManageAccountData.java

@@ -93,6 +93,24 @@ public class ExcelManageAccountData {
 	@DbIgnore
 	private String activeCodeStatus;
 
+	/**
+	 * 是否外部采购
+	 */
+	@DbField("a.outside_purchase")
+	@ExcelIgnore
+	private Boolean outsidePurchase;
+
+	/**
+	 * 是否外部采购
+	 */
+	@DbField("if(a.outside_purchase,'是','否')")
+	@ExcelProperty("外部采购")
+	private String outsidePurchaseStr;
+
+	@DbField("a.verify_link")
+	@ExcelProperty("同户更新装置")
+	private String verifyLink;
+
 	//@DbField("select count(ur.id) from user_ticket_cleared_record ur where ur.account_id = a.id and deleted is true and source = 'self'")
 	@ExcelIgnore
 	@DbIgnore

netflix-dao/src/main/java/com/cyksj/model/excel/ExcelPrepareAccountData.java

@@ -43,4 +43,7 @@ public class ExcelPrepareAccountData {
      */
     @ExcelProperty("关联邮箱")
     private String relateEmail;
+
+    @ExcelProperty("验证链接")
+    private String verifyLink;
 }

netflix-dao/src/main/java/com/cyksj/model/manage/views/AccountView.java

@@ -173,4 +173,13 @@ public class AccountView {
 
     @DbField("a.type")
     private Integer type;
+
+    @DbField("a.verify_link")
+    private String verifyLink;
+
+    /**
+     * 是否外部采购
+     */
+    @DbField("a.outside_purchase")
+    private Boolean outsidePurchase;
 }

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

@@ -37,7 +37,6 @@ import com.cyksj.model.response.OrderDonAccountRep;
 import com.cyksj.model.views.*;
 import com.cyksj.redis.RedisService;
 import com.cyksj.service.chatgpt.ChatGptAccountService;
-import com.cyksj.service.mail.YhMailService;
 import com.cyksj.service.mange.AccountCommonService;
 import com.cyksj.service.mange.CmsAccountService;
 import com.cyksj.service.mange.CmsGroupService;
@@ -490,6 +489,13 @@ public class CmsAccountController {
 					if (StrUtil.isNotBlank(isMonth)) {
 						at.setIsMonth(true);
 					}
+					String outsidePurchase = data.getOutsidePurchase();
+					if (StrUtil.isNotEmpty(outsidePurchase)) {
+						if (outsidePurchase.equals("是") || outsidePurchase.equals("1")) {
+							at.setOutsidePurchase(true);
+						}
+					}
+					at.setVerifyLink(data.getVerifyLink());
 					if (StrUtil.isNotBlank(startTime)) {
 						at.setStartTime(DateUtil.parse(startTime));
 					} else {
@@ -1143,6 +1149,8 @@ public class CmsAccountController {
 				insert.setEmail(data.getSecondEmail());
 				//关联邮箱
 				insert.setRelateEmail(data.getRelateEmail());
+				//验证链接
+				insert.setVerifyLink(data.getVerifyLink());
 				//账号是否已经添加过
 				if (!insert.getAccount().contains("客服")) {
 					if (accountCommonService.checkIsDupAccount(insert.getGoodsId(), insert.getAccount())) {