|
@@ -174,6 +174,7 @@ public class CmsAccountController {
|
|
|
Boolean flag = false;
|
|
Boolean flag = false;
|
|
|
Boolean isUpdatePwd = false;
|
|
Boolean isUpdatePwd = false;
|
|
|
if (account != null) {
|
|
if (account != null) {
|
|
|
|
|
+ account.setBankCard(data.getBankCard());
|
|
|
String oldPwd = account.getPassword();
|
|
String oldPwd = account.getPassword();
|
|
|
if (StrUtil.isNotBlank(data.getStartTime())) {
|
|
if (StrUtil.isNotBlank(data.getStartTime())) {
|
|
|
account.setStartTime(DateUtil.parse(data.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
|
|
account.setStartTime(DateUtil.parse(data.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
|
|
@@ -260,7 +261,7 @@ public class CmsAccountController {
|
|
|
@SneakyThrows
|
|
@SneakyThrows
|
|
|
@Override
|
|
@Override
|
|
|
public void invoke(ExcelImportAccountData data, AnalysisContext analysisContext) {
|
|
public void invoke(ExcelImportAccountData data, AnalysisContext analysisContext) {
|
|
|
- String account = data.getAccount(), password = data.getPassword(), startTime = data.getStartTime(), expiryTime = data.getExpiryTime();
|
|
|
|
|
|
|
+ String account = data.getAccount(), password = data.getPassword(), startTime = data.getStartTime(), expiryTime = data.getExpiryTime(), bankCard = data.getBankCard();
|
|
|
if (StrUtil.isNotBlank(data.getAccount())) {
|
|
if (StrUtil.isNotBlank(data.getAccount())) {
|
|
|
//账号是否已经添加过
|
|
//账号是否已经添加过
|
|
|
if (!account.contains("客服")) {
|
|
if (!account.contains("客服")) {
|
|
@@ -277,6 +278,7 @@ public class CmsAccountController {
|
|
|
at.setPassword(password.trim());
|
|
at.setPassword(password.trim());
|
|
|
at.setGoodsId(goodsId);
|
|
at.setGoodsId(goodsId);
|
|
|
at.setSkuId(skuId);
|
|
at.setSkuId(skuId);
|
|
|
|
|
+ at.setBankCard(bankCard);
|
|
|
if (StrUtil.isNotBlank(startTime)) {
|
|
if (StrUtil.isNotBlank(startTime)) {
|
|
|
at.setStartTime(DateUtil.parse(startTime, "yyyy-MM-dd HH:mm:ss"));
|
|
at.setStartTime(DateUtil.parse(startTime, "yyyy-MM-dd HH:mm:ss"));
|
|
|
}
|
|
}
|