Merge remote-tracking branch 'origin/api' into api
| | |
| | | private String photo; |
| | | |
| | | @Length(max = 10, min = 1) |
| | | @NotBlank(message = "会员编号不能为空") |
| | | @ApiModelProperty(value = "会员编号") |
| | | private String vipNo; |
| | | |
| | |
| | | @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; |
| | | |
| | |
| | | @ApiModelProperty(value = "会员ID") |
| | | private Long vipId; |
| | | |
| | | @NotBlank(message = "会员编号不能为空") |
| | | @ApiModelProperty(value = "会员编号") |
| | | private String vipNo; |
| | | |
| | |
| | | @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; |
| | | |
| | |
| | | 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(), |
| | |
| | | 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(), |