jyy
2021-01-25 124bbd56064fea49f51ac53f87acd3f974bcf744
Merge remote-tracking branch 'origin/api' into api
3 files modified
12 ■■■■ changed files
zq-erp/src/main/java/com/matrix/system/app/dto/AddVipDto.java 4 ●●● patch | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/dto/ModifyVipDto.java 4 ●●● patch | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java 4 ●●●● patch | view | raw | blame | history
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;
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;
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java
@@ -457,9 +457,11 @@
    public int apiAddVip(AddVipDto addVipDto) {
        SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        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(),
@@ -525,12 +527,14 @@
            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("编号已存在!");
            }
        }
        }
        if (!vipInfo.getPhone().equals(modifyVipDto.getPhone())) {
            if (serviceUtil.addCheckRepeatTowColumn(TableMapping.SYS_VIP_INFO, "PHONE", modifyVipDto.getPhone(),