备用账号导入

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

@@ -24,4 +24,23 @@ public class ExcelPrepareAccountData {
      */
     @ExcelProperty("银行卡号")
     private String bankCard;
+
+
+    /**
+     * 到期日期
+     */
+    @ExcelProperty("到期日期")
+    private String expiryTime;
+
+    /**
+     * 辅助邮箱
+     */
+    @ExcelProperty("辅助邮箱")
+    private String secondEmail;
+
+    /**
+     * 辅助邮箱
+     */
+    @ExcelProperty("关联邮箱")
+    private String relateEmail;
 }

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

@@ -1132,8 +1132,16 @@ public class CmsAccountController {
 				insert.setPreSkuIds(f_skuIds);
 				insert.setType(2);
 				insert.setStartTime(DateTime.now());
-				insert.setExpiryTime(DateUtil.offsetMonth(DateTime.now(), 1));
+				if (data.getExpiryTime() != null) {
+					insert.setExpiryTime(DateUtil.parse(data.getExpiryTime()));
+				} else {
+					insert.setExpiryTime(DateUtil.offsetMonth(DateTime.now(), 1));
+				}
 				insert.setBankCard(data.getBankCard());
+				//辅助邮箱
+				insert.setEmail(data.getSecondEmail());
+				//关联邮箱
+				insert.setRelateEmail(data.getRelateEmail());
 				//账号是否已经添加过
 				if (!insert.getAccount().contains("客服")) {
 					if (accountCommonService.checkIsDupAccount(insert.getGoodsId(), insert.getAccount())) {