From f5bc84f93abf31e1768bcf4cd9bcc6bda2a7746b Mon Sep 17 00:00:00 2001 From: x_z Date: Tue, 21 Jun 2022 18:03:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9sql=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=8B=BC=E6=8E=A5=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml index 7ce68d6..ce9745c 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml @@ -11,9 +11,6 @@ AND companyName like concat(#{companyName},'%') - - - AND checkType = #{checkType} From 6c73c4aa084336a0d1bac02c16b676f7b99f902b Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Wed, 22 Jun 2022 10:20:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8F=B7=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml | 1 + .../src/main/resources/mybatis/mapper/inout/CodesTempDao.xml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml index bfd463b..4b2c14e 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml @@ -164,6 +164,7 @@ UPDATE io_codes relId=#{relId}, + `serialNo`=#{serialNo}, fromCorp=#{fromCorp}, fromCorpId=#{fromCorpId}, `count`=#{count}, diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml index fceaab1..ba8b78f 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml @@ -126,6 +126,7 @@ `produceDate`=#{produceDate}, `expireDate`=#{expireDate}, `batchNo`=#{batchNo}, + `serialNo`=#{serialNo}, `supId`=#{supId}, `relId`=#{relId}, @@ -144,6 +145,7 @@ `produceDate`=#{produceDate}, `expireDate`=#{expireDate}, `batchNo`=#{batchNo}, + `serialNo`=#{serialNo}, `relId`=#{relId}, WHERE id=#{id} @@ -159,6 +161,7 @@ `fromCorp`=#{fromCorp}, `locStorageCode`=#{locStorageCode}, `supId`=#{supId}, + `serialNo`=#{serialNo}, `relId`=#{relId}, WHERE orderId=#{orderId} From 55bf8f3115f6817218c948de0c4bce2c92391e02 Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 22 Jun 2022 21:52:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=80=BB=E8=BE=91=EF=BC=8C=E5=BD=93=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E5=8F=82=E6=95=B0=E8=AE=BE=E7=BD=AE=E4=B8=BA=E6=96=B0?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B3=A8=E5=86=8C=E6=97=B6=E4=B8=8D=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E6=97=B6=EF=BC=8C=E6=9F=A5=E8=AF=A2=E4=BC=81=E4=B8=9A?= =?UTF-8?q?ID=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E5=85=AC=E5=8F=B8=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/auth/RegisterController.java | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java index a44d252..ea79561 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java @@ -1,5 +1,6 @@ package com.glxp.sale.admin.controller.auth; +import cn.hutool.core.util.ReUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; @@ -106,8 +107,9 @@ public class RegisterController { if (!customerContactEntity.getMobile().equals(checkCodeRequest.getPhoneNum())) { return ResultVOUtils.error(500, "手机号与注册时不一致"); } - } else + } else { return ResultVOUtils.error(500, "手机号与注册时不一致"); + } } } @@ -132,8 +134,9 @@ public class RegisterController { //验证码存入redis中 redisUtil.set(Constant.CAPTCHAS + checkCodeRequest.getPhoneNum(), json, 300L); return ResultVOUtils.success("发送成功" + " " + mobile_code); - } else + } else { return ResultVOUtils.error(500, "验证码发送失败"); + } } @@ -222,13 +225,21 @@ public class RegisterController { if (isExitPhone) { return ResultVOUtils.error(500, "该手机号已被注册"); } + //校验邮箱是否正确 + if (StrUtil.isNotBlank(userRegisterEntity.getEmail())) { + boolean match = ReUtil.isMatch("^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*$", userRegisterEntity.getEmail()); + if (!match) { + return ResultVOUtils.error(500, "邮箱格式错误"); + } + } String company_check = systemParamConfigService.selectValueByParamKey("register_company_check"); if (StrUtil.isNotBlank(company_check) && company_check.equals("1")) { //新用户注册时根据往来单位字典进行企业名称校验 CustomerInfoEntity customerInfoEntity = customerInfoService.selectById(Long.parseLong(userRegisterEntity.getCompanyId())); - if (customerInfoEntity != null) + if (customerInfoEntity != null) { return ResultVOUtils.error(500, "该企业已被注册！"); + } } userRegisterEntity.setRegisterTime(DateUtil.getDateTime()); @@ -292,10 +303,6 @@ public class RegisterController { return ResultVOUtils.error(500, "手机号与该用户不匹配"); } - -// if (!b) { -// return ResultVOUtils.error(ResultEnum.NOT_NETWORK); -// } return ResultVOUtils.success("密码修改成功"); } @@ -309,7 +316,14 @@ public class RegisterController { } long userId = generateUserId(); UserRegisterEntity userRegisterEntity = userRegisterService.selectById(registerCheckRequest.getId()); - userId = Long.parseLong(userRegisterEntity.getCompanyId()); + if (StrUtil.isBlank(userRegisterEntity.getCompanyId()) && StrUtil.isNotBlank(registerCheckRequest.getCompanyName())) { + //系统参数设置了 新用户注册时是否根据往来单位字典进行企业名称校验 不校验 + //根据公司名称查询往来单位信息 + BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByName(registerCheckRequest.getCompanyName()); + userId = Long.parseLong(basicUnitMaintainEntity.getErpId()); + } else { + userId = Long.parseLong(userRegisterEntity.getCompanyId()); + } userRegisterEntity.setCheckType(registerCheckRequest.getCheckType()); userRegisterEntity.setCheckTime(DateUtil.getDateTime()); userRegisterEntity.setUserId(userId + "");