update 防止会员id重复

jsowell-admin/src/main/java/com/jsowell/service/MemberService.java

@@ -121,7 +121,7 @@ public class MemberService {
 		MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumberAndMerchantId(phoneNumber, merchantId);
 		if (Objects.isNull(memberBasicInfo)) {
 			// 不存在则新增数据
-			String memberId = IdUtils.getMemberId();
+			String memberId = generateNewMemberId();
 			memberBasicInfo = new MemberBasicInfo();
 			memberBasicInfo.setStatus(Constants.ONE);
 			memberBasicInfo.setMemberId(memberId);
@@ -149,6 +149,17 @@ public class MemberService {
 		return memberToken;
 	}
 
+	private String generateNewMemberId() {
+		while (true) {
+			String memberId = IdUtils.getMemberId();
+			// 通过memberId查询是否已经存在
+			MemberVO memberVO = memberBasicInfoService.queryMemberInfoByMemberId(memberId);
+			if (memberVO == null) {
+				return memberId;
+			}
+		}
+	}
+
 	/**
 	 * 微信一键登录
 	 * @param dto