Merge branch 'master' into test

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

@@ -1517,7 +1517,10 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
         }
         if (StringUtils.isNotBlank(request.getUserPhone()) && StringUtils.isNotBlank(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!");
+            String substring = request.getUserPhone().substring(0, 3);
+            if (substring.equals("190") || substring.equals("193")) {
+                throw new ServiceException(200, "手机号前三位不能是190或193");
+            }
             MemberUserRespDTO userByMobile = userService.getUserByMobile(request.getUserPhone());
             // 初始化一个账号
             if (Objects.isNull(userByMobile)) {
@@ -1526,10 +1529,6 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
         }
     }
 
-    public static void main(String[] args) {
-        Assert.isTrue(Pattern.matches("^[1][3,4,5,7,8,9][1,2,4,5,6,7,8,9][0-9]{8}$", "19372349962"), "手机号前三位不能是190或193!");
-    }
-
     private StoreOrder getInfoException(String orderNo) {
         LambdaQueryWrapper<StoreOrder> lqw = Wrappers.lambdaQuery();
         lqw.eq(StoreOrder::getOrderId, orderNo);

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/PromoterController.java

@@ -127,4 +127,26 @@ public class PromoterController {
         List<PromoterImportExcelVO> list = ExcelUtils.read(file, PromoterImportExcelVO.class);
         return success(promoterService.importUserList(list, updateSupport));
     }
+
+
+    //=======================================排除租户访问========================================
+    @GetMapping("/allPage")
+    @Operation(summary = "获取所有推广员")
+    @TenantIgnore
+    public CommonResult<PageResult<PromoterRespVO>> getAllPromoterPage(@Valid PromoterPageReqVO pageVO) {
+        PageResult<PromoterRespVO> pageResult = promoterService.getPromoterPage(pageVO);
+        return success(pageResult);
+    }
+
+    @PutMapping("/tenantIgnoreUpdate")
+    @Operation(summary = "排除祖父更新推广员")
+    @TenantIgnore
+    public CommonResult<Boolean> updateByPromoter(@Valid @RequestBody PromoterUpdateReqVO updateReqVO) {
+        promoterService.updatePromoter(updateReqVO);
+        return success(true);
+    }
+
+
+//=======================================排除租户访问========================================
+
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterRespVO.java

@@ -20,4 +20,6 @@ public class PromoterRespVO extends PromoterBaseVO {
     private String deptName;
     @Schema(description = "注册来源", required = true, example = "1")
     private String sourceType;
+    @Schema(description = "租户id")
+    private Long tenantId;
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterUpdateReqVO.java

@@ -14,5 +14,7 @@ public class PromoterUpdateReqVO extends PromoterBaseVO {
     @Schema(description = "编号", required = true, example = "3051")
     @NotNull(message = "编号不能为空")
     private Long id;
+    @Schema(description = "租户id")
+    private Long tenantId;
 
 }

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

@@ -29,7 +29,7 @@ public class AppAuthSmsLoginReqVO {
 
     @Schema(description = "手机号", required = true, example = "15601691300")
     @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;
     /**
      * 推广员id

yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/promoter/PromoterMapper.xml

@@ -10,7 +10,7 @@
      -->
 
     <select id="findListPage" resultType="cn.iocoder.yudao.module.member.controller.admin.promoter.vo.PromoterRespVO">
-        select a.id,a.user_id,a.dept_id,b.nickname,b.status,b.mobile,c.parent_organization_name as 'orgName',a.source_type from member_promoter a
+        select a.id,a.user_id,a.dept_id,b.nickname,b.status,b.mobile,c.parent_organization_name as 'orgName',a.source_type,a.tenant_id from member_promoter a
                           left join member_user b on a.user_id = b.id
                             left join system_dept c on c.id=a.dept_id
         <where>

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptRespVO.java

@@ -19,5 +19,6 @@ public class DeptRespVO extends DeptBaseVO {
 
     @Schema(description = "创建时间", required = true, example = "时间戳格式")
     private LocalDateTime createTime;
-
+    @Schema(description = "租户id")
+    private Long tenantId;
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java

@@ -384,7 +384,7 @@ public class DeptServiceImpl implements DeptService {
                 deptDO4.setParentId(deptDO.getId());
                 deptDO4.setParentOrganizationName(deptDO.getParentOrganizationName() + ">" + batchImportVO.getDepName());
                 deptMapper.insert(deptDO4);
-                deptDO4.setParentOrganizationIds(deptDO.getParentOrganizationIds() + ">" + deptDO4.getId());
+                deptDO4.setParentOrganizationIds(deptDO.getParentOrganizationIds() + "," + deptDO4.getId());
                 deptMapper.update(deptDO4, Wrappers.<DeptDO>lambdaUpdate().eq(DeptDO::getId, deptDO4.getId()));
                 deptDOS4.add(deptDO4);
             }