|
@@ -174,7 +174,10 @@ 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());
|
|
|
|
|
|
|
+ if (StrUtil.isNotBlank(data.getBankCard())) {
|
|
|
|
|
+ account.setBankCard(data.getBankCard());
|
|
|
|
|
+ flag = true;
|
|
|
|
|
+ }
|
|
|
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"));
|
|
@@ -472,6 +475,15 @@ public class CmsAccountController {
|
|
|
if (account.getGoodsId() != 1l) {
|
|
if (account.getGoodsId() != 1l) {
|
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult();
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult();
|
|
|
}
|
|
}
|
|
|
|
|
+ //账号是否已经添加过
|
|
|
|
|
+ if (!account.getAccount().contains("客服")) {
|
|
|
|
|
+ int count = accountService.count(Wrappers.lambdaQuery(Account.class)
|
|
|
|
|
+ .eq(Account::getAccount, account.getAccount())
|
|
|
|
|
+ .eq(Account::getGoodsId, account.getGoodsId()));
|
|
|
|
|
+ if (count > 0) {
|
|
|
|
|
+ throw BusinessRuntimeException.getInstance("该平台下已生成该账号");
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
Boolean flag = false;
|
|
Boolean flag = false;
|
|
|
String oldPwd = account.getPassword();
|
|
String oldPwd = account.getPassword();
|
|
|
if (account != null) {
|
|
if (account != null) {
|