Merge remote-tracking branch 'origin/bd_dev' into bd_dev

bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java

@@ -175,11 +175,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
 
     @Override
     public CuMemberExt getMemberByCode(String memberCode) {
-        CuMemberExt cuMemberExt = baseMapper.queryLoginMember(memberCode, null);
-        if (null == cuMemberExt && memberCode.length() == 7) {
-            return baseMapper.queryTmpLoginMember(memberCode);
-        }
-        return cuMemberExt;
+        return baseMapper.queryLoginMember(memberCode, null);
     }
 
     @Override

bd-business/bd-business-member/src/main/java/com/hzs/member/login/service/impl/MemberLoginServiceImpl.java

@@ -181,12 +181,12 @@ public class MemberLoginServiceImpl implements IMemberLoginService {
         R<LoginMember> memberResult = iMemberServiceApi.getMemberInfo(username);
 
         if (R.FAIL == memberResult.getCode()) {
-            if (username.length() >= 14) {
-                // 如果上树会员表中不存在，并且用户编号是14位，则查询分享会员表
-                return this.passwordFreeshareLogin(username);
-            } else {
+//            if (username.length() >= 14) {
+//                // 如果上树会员表中不存在，并且用户编号是14位，则查询分享会员表
+//                return this.passwordFreeshareLogin(username);
+//            } else {
             throw new ServiceException(memberResult.getMsg());
-            }
+//            }
         }
 
         if (StringUtils.isNull(memberResult.getData())) {
@@ -199,10 +199,13 @@ public class MemberLoginServiceImpl implements IMemberLoginService {
         CuMemberExt member = loginMember.getCuMember();
         // 用户未支付状态
         if (EPayStatus.UNPAID.getValue() == member.getPayStatus()) {
+            if (null != member.getPkPlaceParent()) {
+                // 兼容0元注册，有安置的为正常会员需要判断支付状态
                 recordLoginLog(null, EStatus.NO, username + " 登录用户不存在");
                 // 登录用户: %s 不存在
                 throw new ServiceException(TransactionUtils.getContent(SystemMsgConstants.USER_NOT_EXIST, username));
             }
+        }
         // 非正常点位（死点、已注销），不能登录
         if (ECategory.NORMAL.getValue() != member.getCategory()) {
             recordLoginLog(loginMember.getPkId(), EStatus.NO, "非正常用户不能进行登录");