## 免密登录不校验用户支付状态;去掉7位用户编号单独登录方法;
This commit is contained in:
parent
86b935a85a
commit
c2c50a8408
|
@ -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")
|
@GetMapping("/password-free")
|
||||||
public AjaxResult retailPasswordFree(RetailMemberVO retailMemberVO) {
|
public AjaxResult retailPasswordFree(RetailMemberVO retailMemberVO) {
|
||||||
|
|
|
@ -33,14 +33,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
|
||||||
*/
|
*/
|
||||||
CuMemberExt queryLoginMember(@Param("memberCode") String memberCode, @Param("pkMember") Long pkMember);
|
CuMemberExt queryLoginMember(@Param("memberCode") String memberCode, @Param("pkMember") Long pkMember);
|
||||||
|
|
||||||
/**
|
|
||||||
* 根据服务编号登录用户(2024.07.09 兼容海外临时需求)
|
|
||||||
*
|
|
||||||
* @param serviceCode 服务编号
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
CuMemberExt queryTmpLoginMember(@Param("serviceCode") String serviceCode);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 前台查询会员的方法,通过传输不同的参数,查询不同的会员
|
* 前台查询会员的方法,通过传输不同的参数,查询不同的会员
|
||||||
*
|
*
|
||||||
|
|
|
@ -162,11 +162,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public CuMemberExt getMemberByCode(String memberCode) {
|
public CuMemberExt getMemberByCode(String memberCode) {
|
||||||
CuMemberExt cuMemberExt = baseMapper.queryLoginMember(memberCode, null);
|
return baseMapper.queryLoginMember(memberCode, null);
|
||||||
if (null == cuMemberExt && memberCode.length() == 7) {
|
|
||||||
return baseMapper.queryTmpLoginMember(memberCode);
|
|
||||||
}
|
|
||||||
return cuMemberExt;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -191,11 +187,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public CuMember queryMember(String memberCode) {
|
public CuMember queryMember(String memberCode) {
|
||||||
CuMember cuMember = baseMapper.queryLoginMember(memberCode, null);
|
return baseMapper.queryLoginMember(memberCode, null);
|
||||||
if (null == cuMember && memberCode.length() == 7) {
|
|
||||||
return baseMapper.queryTmpLoginMember(memberCode);
|
|
||||||
}
|
|
||||||
return cuMember;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -138,12 +138,6 @@ public class MemberLoginServiceImpl implements IMemberLoginService {
|
||||||
|
|
||||||
LoginMember loginMember = memberResult.getData();
|
LoginMember loginMember = memberResult.getData();
|
||||||
CuMemberExt member = loginMember.getCuMember();
|
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()) {
|
if (ECategory.NORMAL.getValue() != member.getCategory()) {
|
||||||
recordLoginLog(loginMember.getPkId(), EStatus.NO, "非正常用户不能进行登录");
|
recordLoginLog(loginMember.getPkId(), EStatus.NO, "非正常用户不能进行登录");
|
||||||
|
|
|
@ -265,16 +265,6 @@
|
||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<!-- 根据服务编号登录用户(2024.07.09 兼容海外临时需求) -->
|
|
||||||
<select id="queryTmpLoginMember" resultMap="MemberResultMap">
|
|
||||||
select cm.*
|
|
||||||
from cu_member cm
|
|
||||||
where cm.del_flag = 0
|
|
||||||
<if test="serviceCode != null and serviceCode != ''">
|
|
||||||
and cm.SERVICE_CODE = #{serviceCode}
|
|
||||||
</if>
|
|
||||||
</select>
|
|
||||||
|
|
||||||
<!--and cm.PAY_STATUS=1-->
|
<!--and cm.PAY_STATUS=1-->
|
||||||
<select id="queryMemberInfoByCondition" resultMap="MemberResultMap">
|
<select id="queryMemberInfoByCondition" resultMap="MemberResultMap">
|
||||||
<include refid="CuMember_Column"/>
|
<include refid="CuMember_Column"/>
|
||||||
|
|
Loading…
Reference in New Issue