zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/mall_product'

feature/mall_product
tangqian 2023-06-09 14:56:14 +08:00
parent 5964eabb05 eca405b763
commit 5cf0b9a8b4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java
View File

@ -1517,7 +1517,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
} }
if (StringUtils.isNotBlank(request.getUserPhone()) && StringUtils.isNotBlank(request.getConfirmPhone())) { if (StringUtils.isNotBlank(request.getUserPhone()) && StringUtils.isNotBlank(request.getConfirmPhone())) {
Assert.isTrue(StringUtils.equals(request.getUserPhone(), request.getConfirmPhone()), "输入号码不一致!"); Assert.isTrue(StringUtils.equals(request.getUserPhone(), request.getConfirmPhone()), "输入号码不一致!");
Assert.isTrue(Pattern.matches("^[1][3,4,5,7,8,9][1,2,4,5,6,7,8,9][0-9]{8}$", request.getUserPhone()), "手机号前三位不能是190或193!"); // Assert.isTrue(Pattern.matches("^[1][3,4,5,7,8,9][1,2,4,5,6,7,8,9][0-9]{8}$", request.getUserPhone()), "手机号前三位不能是190或193!");
MemberUserRespDTO userByMobile = userService.getUserByMobile(request.getUserPhone()); MemberUserRespDTO userByMobile = userService.getUserByMobile(request.getUserPhone());
// 初始化一个账号 // 初始化一个账号
if (Objects.isNull(userByMobile)) { if (Objects.isNull(userByMobile)) {

2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/vo/AppAuthSmsLoginReqVO.java
View File

@ -29,7 +29,7 @@ public class AppAuthSmsLoginReqVO {
@Schema(description = "手机号", required = true, example = "15601691300") @Schema(description = "手机号", required = true, example = "15601691300")
@NotEmpty(message = "手机号不能为空") @NotEmpty(message = "手机号不能为空")
@Pattern(regexp = "^[1][3,4,5,7,8,9][1,2,4,5,6,7,8,9][0-9]{8}$",message = "手机号不正确") // @Pattern(regexp = "^[1][3,4,5,7,8,9][0,1,2,4,5,6,7,8,9][0-9]{8}$",message = "手机号不正确")
private String mobile; private String mobile;
/** /**
* 推广员id * 推广员id