From c2c50a8408122eb2fdb026b2c839bbcb182702bf Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Wed, 18 Jun 2025 10:55:44 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=85=8D=E5=AF=86=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E4=B8=8D=E6=A0=A1=E9=AA=8C=E7=94=A8=E6=88=B7=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E7=8A=B6=E6=80=81=EF=BC=9B=E5=8E=BB=E6=8E=897=E4=BD=8D?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BC=96=E5=8F=B7=E5=8D=95=E7=8B=AC=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E6=96=B9=E6=B3=95=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/controller/manage/CuMemberController.java | 5 ----- .../com/hzs/member/base/mapper/CuMemberMapper.java | 8 -------- .../base/service/impl/CuMemberServiceImpl.java | 12 ++---------- .../login/service/impl/MemberLoginServiceImpl.java | 6 ------ .../resources/mapper/member/base/CuMemberMapper.xml | 10 ---------- 5 files changed, 2 insertions(+), 39 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java index 93b001ba..01cbed32 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java @@ -1041,11 +1041,6 @@ public class CuMemberController extends BaseController { /** * 免密登录 - * - * @author: zhang jing - * @date: 2023/6/6 10:05 - * @param: [memberTeamInfoParam] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/password-free") public AjaxResult retailPasswordFree(RetailMemberVO retailMemberVO) { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java index ef00d63f..553dd7bf 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java @@ -33,14 +33,6 @@ public interface CuMemberMapper extends BaseMapper { */ CuMemberExt queryLoginMember(@Param("memberCode") String memberCode, @Param("pkMember") Long pkMember); - /** - * 根据服务编号登录用户（2024.07.09 兼容海外临时需求） - * - * @param serviceCode 服务编号 - * @return - */ - CuMemberExt queryTmpLoginMember(@Param("serviceCode") String serviceCode); - /** * 前台查询会员的方法，通过传输不同的参数，查询不同的会员 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java index 115af218..f9b04571 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java @@ -162,11 +162,7 @@ public class CuMemberServiceImpl extends ServiceImpl 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 @@ -191,11 +187,7 @@ public class CuMemberServiceImpl extends ServiceImpl i @Override public CuMember queryMember(String memberCode) { - CuMember cuMember = baseMapper.queryLoginMember(memberCode, null); - if (null == cuMember && memberCode.length() == 7) { - return baseMapper.queryTmpLoginMember(memberCode); - } - return cuMember; + return baseMapper.queryLoginMember(memberCode, null); } @Override diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/login/service/impl/MemberLoginServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/login/service/impl/MemberLoginServiceImpl.java index ca533ad4..c2a8572d 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/login/service/impl/MemberLoginServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/login/service/impl/MemberLoginServiceImpl.java @@ -138,12 +138,6 @@ public class MemberLoginServiceImpl implements IMemberLoginService { LoginMember loginMember = memberResult.getData(); CuMemberExt member = loginMember.getCuMember(); - // 用户未支付状态 - if (ECustomerType.FANS.getValue() != member.getCustomerType() && EPayStatus.UNPAID.getValue() == member.getPayStatus()) { - 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, "非正常用户不能进行登录"); diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml index 0d877f84..993b6e3e 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml @@ -265,16 +265,6 @@ - - -