|
|
@@ -273,7 +273,7 @@ public class CmsAccountController {
|
|
|
}
|
|
|
String oldPwd = account.getPassword();
|
|
|
if (StrUtil.isNotBlank(data.getExpiryTime())) {
|
|
|
- account.setExpiryTime(DateUtil.parse(data.getExpiryTime(), "yyyy-MM-dd HH:mm:ss"));
|
|
|
+ account.setExpiryTime(DateUtil.parse(data.getExpiryTime()));
|
|
|
flag = true;
|
|
|
}
|
|
|
String new_pass = data.getPassword();
|
|
|
@@ -398,12 +398,12 @@ public class CmsAccountController {
|
|
|
at.setSkuId(skuId);
|
|
|
at.setBankCard(bankCard);
|
|
|
if (StrUtil.isNotBlank(startTime)) {
|
|
|
- at.setStartTime(DateUtil.parse(startTime, "yyyy-MM-dd HH:mm:ss"));
|
|
|
+ at.setStartTime(DateUtil.parse(startTime));
|
|
|
} else {
|
|
|
at.setStartTime(DateTime.now());
|
|
|
}
|
|
|
if (StrUtil.isNotBlank(expiryTime)) {
|
|
|
- at.setExpiryTime(DateUtil.parse(expiryTime, "yyyy-MM-dd HH:mm:ss"));
|
|
|
+ at.setExpiryTime(DateUtil.parse(expiryTime));
|
|
|
} else {
|
|
|
at.setExpiryTime(DateUtil.offsetMonth(at.getStartTime(), 1));
|
|
|
}
|