From 758c879a446878911565de9a57bb229636a6bb14 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 25 Jan 2021 10:47:08 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/app/dto/ModifyVipDto.java | 4 +---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java | 18 +++++++++++-------
zq-erp/src/main/java/com/matrix/system/app/dto/AddVipDto.java | 4 +---
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/AddVipDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/AddVipDto.java
index ade6a97..cbacf14 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/dto/AddVipDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/AddVipDto.java
@@ -21,7 +21,6 @@
private String photo;
@Length(max = 10, min = 1)
- @NotBlank(message = "会员编号不能为空")
@ApiModelProperty(value = "会员编号")
private String vipNo;
@@ -42,8 +41,7 @@
@JsonFormat(pattern = DateUtil.DATE_FORMAT_DD, timezone = "GMT+8")
private Date birthday;
- @Length(min = 6, max = 6)
- @NotBlank(message = "参数错误")
+ @Length(max = 6,message = "资金密码为6位数")
@ApiModelProperty(value = "资金密码", example = "123456")
private String password;
diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/ModifyVipDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/ModifyVipDto.java
index 3f04e94..85a5de1 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/dto/ModifyVipDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/ModifyVipDto.java
@@ -25,7 +25,6 @@
@ApiModelProperty(value = "会员ID")
private Long vipId;
- @NotBlank(message = "会员编号不能为空")
@ApiModelProperty(value = "会员编号")
private String vipNo;
@@ -46,8 +45,7 @@
@JsonFormat(pattern = DateUtil.DATE_FORMAT_DD, timezone = "GMT+8")
private Date birthday;
- @Length(min = 6, max = 6)
- @NotBlank(message = "参数错误")
+ @Length(max = 6)
@ApiModelProperty(value = "资金密码", example = "123456")
private String password;
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java
index 025715b..769f155 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java
@@ -439,9 +439,11 @@
public int apiAddVip(AddVipDto addVipDto) {
SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- if (serviceUtil.addCheckRepeatTowColumn(TableMapping.SYS_VIP_INFO, "VIP_NO", addVipDto.getVipNo(),
- "company_id",user.getCompanyId())) {
- throw new GlobleException("编号已存在!");
+ if (StringUtils.isNotBlank(addVipDto.getVipNo())) {
+ if (serviceUtil.addCheckRepeatTowColumn(TableMapping.SYS_VIP_INFO, "VIP_NO", addVipDto.getVipNo(),
+ "company_id", user.getCompanyId())) {
+ throw new GlobleException("编号已存在!");
+ }
}
if (serviceUtil.addCheckRepeatTowColumn(TableMapping.SYS_VIP_INFO, "PHONE", addVipDto.getPhone(),
@@ -502,10 +504,12 @@
throw new GlobleException("用户不存在");
}
- if (!modifyVipDto.getVipNo().equals(vipInfo.getVipNo())) {
- if (serviceUtil.addCheckRepeatTowColumn(TableMapping.SYS_VIP_INFO, "VIP_NO", modifyVipDto.getVipNo(),
- "company_id",user.getCompanyId())) {
- throw new GlobleException("编号已存在!");
+ if (StringUtils.isNotBlank(modifyVipDto.getVipNo())) {
+ if (!modifyVipDto.getVipNo().equals(vipInfo.getVipNo())) {
+ if (serviceUtil.addCheckRepeatTowColumn(TableMapping.SYS_VIP_INFO, "VIP_NO", modifyVipDto.getVipNo(),
+ "company_id", user.getCompanyId())) {
+ throw new GlobleException("编号已存在!");
+ }
}
}
--
Gitblit v1.9.1