## 188自动登录；
This commit is contained in:
parent
e2e5b3bf63
commit
c73476a192
|
|
@ -2,22 +2,10 @@ package com.hzs.member.base.mapper;
|
|||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.hzs.common.domain.member.base.CuMemberShare;
|
||||
import com.hzs.member.marketnews.param.SeaFlourParam;
|
||||
import com.hzs.member.marketnews.vo.SeaFlourVo;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 分享注册记录会员 Mapper 接口
|
||||
*/
|
||||
public interface CuMemberShareMapper extends BaseMapper<CuMemberShare> {
|
||||
|
||||
/**
|
||||
* 海粉列表
|
||||
*
|
||||
* @param seaFlourParam
|
||||
* @return
|
||||
*/
|
||||
List<SeaFlourVo> seaFlourList(SeaFlourParam seaFlourParam);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,10 +2,6 @@ package com.hzs.member.base.service;
|
|||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.hzs.common.domain.member.base.CuMemberShare;
|
||||
import com.hzs.member.marketnews.param.SeaFlourParam;
|
||||
import com.hzs.member.marketnews.vo.SeaFlourVo;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 分享注册记录会员 服务类
|
||||
|
|
@ -26,11 +22,4 @@ public interface ICuMemberShareService extends IService<CuMemberShare> {
|
|||
*/
|
||||
Boolean updateCuMemberShare(Long pkMember);
|
||||
|
||||
/**
|
||||
* 海粉列表
|
||||
*
|
||||
* @param seaFlourParam
|
||||
* @return
|
||||
*/
|
||||
List<SeaFlourVo> seaFlourList(SeaFlourParam seaFlourParam);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,12 +7,8 @@ import com.hzs.common.core.utils.DateUtils;
|
|||
import com.hzs.common.domain.member.base.CuMemberShare;
|
||||
import com.hzs.member.base.mapper.CuMemberShareMapper;
|
||||
import com.hzs.member.base.service.ICuMemberShareService;
|
||||
import com.hzs.member.marketnews.param.SeaFlourParam;
|
||||
import com.hzs.member.marketnews.vo.SeaFlourVo;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 分享注册记录会员 服务实现类
|
||||
*/
|
||||
|
|
@ -35,8 +31,4 @@ public class CuMemberShareServiceImpl extends ServiceImpl<CuMemberShareMapper, C
|
|||
return baseMapper.updateById(cuMemberShare) > 0 ? Boolean.TRUE : Boolean.FALSE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SeaFlourVo> seaFlourList(SeaFlourParam seaFlourParam) {
|
||||
return baseMapper.seaFlourList(seaFlourParam);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,8 +24,6 @@ import javax.servlet.http.HttpServletRequest;
|
|||
|
||||
/**
|
||||
* 会员端 token 控制
|
||||
*
|
||||
* @author hzs
|
||||
*/
|
||||
@RequestMapping("/auth/api")
|
||||
@RestController
|
||||
|
|
|
|||
|
|
@ -3,11 +3,7 @@ package com.hzs.member.login.param;
|
|||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description: 海粉自动注册登录入参
|
||||
* @Author: jiang chao
|
||||
* @Time: 2023/9/6 23:26
|
||||
* @Classname: AutoLoginVO
|
||||
* @PackageName: com.hzs.member.login.vo
|
||||
* 海粉自动注册登录入参
|
||||
*/
|
||||
@Data
|
||||
public class AutoLoginParam {
|
||||
|
|
|
|||
|
|
@ -28,8 +28,6 @@ import javax.servlet.http.HttpServletRequest;
|
|||
|
||||
/**
|
||||
* 登录/登出服务
|
||||
*
|
||||
* @author hzs
|
||||
*/
|
||||
@Slf4j
|
||||
@Component
|
||||
|
|
@ -43,13 +41,6 @@ public class MemberLoginServiceImpl implements IMemberLoginService {
|
|||
@DubboReference
|
||||
IMemberServiceApi iMemberServiceApi;
|
||||
|
||||
/**
|
||||
* 登录
|
||||
*
|
||||
* @param username 用户名
|
||||
* @param password 密码
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public LoginMember login(String username, String password) {
|
||||
// 用户名或密码为空 错误
|
||||
|
|
@ -151,13 +142,6 @@ public class MemberLoginServiceImpl implements IMemberLoginService {
|
|||
return loginMember;
|
||||
}
|
||||
|
||||
/**
|
||||
* 分享登录
|
||||
*
|
||||
* @param username 用户名
|
||||
* @param password 密码
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public LoginMember shareLogin(String username, String password) {
|
||||
// 用户名或密码为空 错误
|
||||
|
|
@ -173,7 +157,6 @@ public class MemberLoginServiceImpl implements IMemberLoginService {
|
|||
}
|
||||
|
||||
if (StringUtils.isNull(memberResult.getData())) {
|
||||
recordLoginLog(null, EStatus.NO, username + " 登录用户不存在");
|
||||
// 登录用户: %s 不存在
|
||||
throw new ServiceException(TransactionUtils.getContent(SystemMsgConstants.USER_NOT_EXIST, username));
|
||||
}
|
||||
|
|
@ -182,24 +165,13 @@ public class MemberLoginServiceImpl implements IMemberLoginService {
|
|||
CuMemberShare cuMemberShare = loginMember.getCuMemberShare();
|
||||
// 密码校验
|
||||
if (!SecurityUtils.matchesPassword(password, cuMemberShare.getLoginPwd())) {
|
||||
recordLoginLog(loginMember.getPkId(), EStatus.NO, "用户密码错误");
|
||||
// 用户不存在/密码错误
|
||||
throw new ServiceException(TransactionUtils.getContent(SystemMsgConstants.USER_ERROR, username));
|
||||
}
|
||||
|
||||
// TODO 日志改为异步MQ处理
|
||||
recordLoginLog(loginMember.getPkId(), EStatus.YES, "登录成功");
|
||||
return loginMember;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @description: 免密登录
|
||||
* @author: zhang jing
|
||||
* @date: 2023/6/6 17:15
|
||||
* @param: [username]
|
||||
* @return: com.hzs.member.base.dto.LoginMember
|
||||
**/
|
||||
@Override
|
||||
public LoginMember passwordFreelogin(String username) {
|
||||
// 查询用户信息
|
||||
|
|
@ -247,13 +219,6 @@ public class MemberLoginServiceImpl implements IMemberLoginService {
|
|||
return loginMember;
|
||||
}
|
||||
|
||||
/**
|
||||
* @description: 免密 分享登录
|
||||
* @author: zhang jing
|
||||
* @date: 2023/6/6 17:04
|
||||
* @param: [username]
|
||||
* @return: com.hzs.member.base.dto.LoginMember
|
||||
**/
|
||||
@Override
|
||||
public LoginMember passwordFreeshareLogin(String username) {
|
||||
// 查询用户信息
|
||||
|
|
@ -275,13 +240,6 @@ public class MemberLoginServiceImpl implements IMemberLoginService {
|
|||
return loginMember;
|
||||
}
|
||||
|
||||
/**
|
||||
* 小程序登录
|
||||
*
|
||||
* @param username 用户名
|
||||
* @param password 密码
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public LoginMember appletLogin(String username, String password, String loginId, String source) {
|
||||
// 用户名或密码为空 错误
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ package com.hzs.member.marketnews.controller.api;
|
|||
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.util.DesensitizedUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.hzs.common.core.constant.CountryConstants;
|
||||
import com.hzs.common.core.constant.EnumsPrefixConstants;
|
||||
|
|
@ -21,13 +20,10 @@ import com.hzs.common.domain.member.ext.CuMemberBonusPushExt;
|
|||
import com.hzs.common.security.utils.SecurityUtils;
|
||||
import com.hzs.common.service.ITransactionCommonService;
|
||||
import com.hzs.member.base.service.ICuMemberService;
|
||||
import com.hzs.member.base.service.ICuMemberShareService;
|
||||
import com.hzs.member.bonus.service.ICuMemberBonusPushHisService;
|
||||
import com.hzs.member.bonus.service.ICuMemberBonusPushService;
|
||||
import com.hzs.member.marketnews.param.MarketNewsParam;
|
||||
import com.hzs.member.marketnews.param.SeaFlourParam;
|
||||
import com.hzs.member.marketnews.param.TripleCycleListParam;
|
||||
import com.hzs.member.marketnews.vo.SeaFlourVo;
|
||||
import com.hzs.member.marketnews.vo.UserInvestmentVo;
|
||||
import com.hzs.system.base.ICurrencyServiceApi;
|
||||
import com.hzs.system.base.dto.CurrencyDTO;
|
||||
|
|
@ -43,7 +39,7 @@ import java.math.BigDecimal;
|
|||
import java.util.*;
|
||||
|
||||
/**
|
||||
* @Description: 市场动态部分接口
|
||||
* 市场动态部分接口
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/api/market-news")
|
||||
|
|
@ -52,8 +48,6 @@ public class MarketNewsController extends BaseController {
|
|||
@Autowired
|
||||
private ITransactionCommonService iTransactionCommonService;
|
||||
@Autowired
|
||||
private ICuMemberShareService iCuMemberShareService;
|
||||
@Autowired
|
||||
private ICuMemberService iCuMemberService;
|
||||
@Autowired
|
||||
private ICuMemberBonusPushService iCuMemberBonusPushService;
|
||||
|
|
@ -170,34 +164,13 @@ public class MarketNewsController extends BaseController {
|
|||
}
|
||||
return getDataTable(list);
|
||||
}
|
||||
private String desensitizationName(String name){
|
||||
|
||||
private String desensitizationName(String name) {
|
||||
return StrUtil.hide(name, 1, name.length() - 1);
|
||||
}
|
||||
private String desensitizationCode(String code){
|
||||
return StrUtil.hide(code, 4, code.length() - 3);
|
||||
}
|
||||
|
||||
/**
|
||||
* 海粉列表
|
||||
*/
|
||||
@GetMapping("/sea_flour_list")
|
||||
public TableDataInfo seaFlourList(SeaFlourParam seaFlourParam) {
|
||||
seaFlourParam.setPkMember(SecurityUtils.getUserId());
|
||||
if (seaFlourParam.getStartCreationTime() != null) {
|
||||
seaFlourParam.setStartCreationTime(DateUtil.beginOfDay(seaFlourParam.getStartCreationTime()));
|
||||
}
|
||||
if (seaFlourParam.getEndCreationTime() != null) {
|
||||
seaFlourParam.setEndCreationTime(DateUtil.endOfDay(seaFlourParam.getEndCreationTime()));
|
||||
}
|
||||
startPage();
|
||||
List<SeaFlourVo> memberList = iCuMemberShareService.seaFlourList(seaFlourParam);
|
||||
if (CollectionUtil.isNotEmpty(memberList)) {
|
||||
for (SeaFlourVo seaFlourVo : memberList) {
|
||||
seaFlourVo.setMemberCode(CommonUtil.getMemberCode(seaFlourVo.getMemberCode(), seaFlourVo.getServiceCode()));
|
||||
seaFlourVo.setMemberName(CommonUtil.getMemberName(seaFlourVo.getPkVertex(), seaFlourVo.getMemberName(), seaFlourVo.getNickName()));
|
||||
}
|
||||
}
|
||||
return getDataTable(memberList);
|
||||
private String desensitizationCode(String code) {
|
||||
return StrUtil.hide(code, 4, code.length() - 3);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -5,13 +5,6 @@ import lombok.Data;
|
|||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Author: yuhui
|
||||
* @Time: 2023/1/27 11:43
|
||||
* @Classname: MarketNewsParam
|
||||
* @PackageName: com.hzs.member.marketNews.param
|
||||
*/
|
||||
@Data
|
||||
public class MarketNewsParam {
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,67 +0,0 @@
|
|||
package com.hzs.member.marketnews.param;/**
|
||||
* @Description:
|
||||
* @Author: yuhui
|
||||
* @Time: 2023/6/6 17:36
|
||||
* @Classname: seaFlourParam
|
||||
* @PackageName: com.hzs.member.marketnews.param
|
||||
*/
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
*@BelongsProject: hzs_cloud
|
||||
*@BelongsPackage: com.hzs.member.marketnews.param
|
||||
*@Author: yh
|
||||
*@CreateTime: 2023-06-06 17:36
|
||||
*@Description: TODO
|
||||
*@Version: 1.0
|
||||
*/
|
||||
@Data
|
||||
public class SeaFlourParam {
|
||||
/**
|
||||
* 会员主键
|
||||
*/
|
||||
private Long pkMember;
|
||||
|
||||
/**
|
||||
* 会员编号
|
||||
*/
|
||||
private String memberCode;
|
||||
|
||||
/**
|
||||
* 会员姓名
|
||||
*/
|
||||
|
||||
private String memberName;
|
||||
|
||||
/**
|
||||
* 开始时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private Date startCreationTime;
|
||||
/**
|
||||
* 结束时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private Date endCreationTime;
|
||||
|
||||
|
||||
/**
|
||||
* 国家
|
||||
*/
|
||||
private Integer pkCountry;
|
||||
|
||||
/**
|
||||
* 注册等级
|
||||
*/
|
||||
private Integer pkRegisterGrade;
|
||||
|
||||
|
||||
/**
|
||||
* 会员信息
|
||||
*/
|
||||
private String memberInfo;
|
||||
}
|
||||
|
|
@ -1,24 +1,10 @@
|
|||
package com.hzs.member.marketnews.param;/**
|
||||
* @Description:
|
||||
* @Author: yuhui
|
||||
* @Time: 2023/6/7 14:43
|
||||
* @Classname: TripleCycleListParam
|
||||
* @PackageName: com.hzs.member.marketnews.param
|
||||
*/
|
||||
package com.hzs.member.marketnews.param;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
*@BelongsProject: hzs_cloud
|
||||
*@BelongsPackage: com.hzs.member.marketnews.param
|
||||
*@Author: yh
|
||||
*@CreateTime: 2023-06-07 14:43
|
||||
*@Description: TODO
|
||||
*@Version: 1.0
|
||||
*/
|
||||
@Data
|
||||
public class TripleCycleListParam {
|
||||
|
||||
|
|
|
|||
|
|
@ -1,61 +0,0 @@
|
|||
package com.hzs.member.marketnews.vo;/**
|
||||
* @Description:
|
||||
* @Author: yuhui
|
||||
* @Time: 2023/6/6 17:38
|
||||
* @Classname: SeaFlourVo
|
||||
* @PackageName: com.hzs.member.marketnews.vo
|
||||
*/
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
*@BelongsProject: hzs_cloud
|
||||
*@BelongsPackage: com.hzs.member.marketnews.vo
|
||||
*@Author: yh
|
||||
*@CreateTime: 2023-06-06 17:38
|
||||
*@Description: TODO
|
||||
*@Version: 1.0
|
||||
*/
|
||||
@Data
|
||||
public class SeaFlourVo {
|
||||
|
||||
/**
|
||||
* 会员编号
|
||||
*/
|
||||
private String memberCode;
|
||||
|
||||
/**
|
||||
* 会员名称
|
||||
*/
|
||||
private String memberName;
|
||||
|
||||
/**
|
||||
* 会员手机
|
||||
*/
|
||||
private String phone;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date creationTime;
|
||||
|
||||
/**
|
||||
* 所属体系
|
||||
*/
|
||||
private Long pkVertex;
|
||||
|
||||
/**
|
||||
* 服务编号
|
||||
*/
|
||||
private String serviceCode;
|
||||
|
||||
/**
|
||||
* 会员昵称
|
||||
*/
|
||||
private String nickName;
|
||||
|
||||
}
|
||||
|
|
@ -8,13 +8,6 @@ import lombok.Data;
|
|||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Author: yuhui
|
||||
* @Time: 2023/1/27 10:44
|
||||
* @Classname: UserInvestmentVo
|
||||
* @PackageName: com.hzs.member.marketNews.vo
|
||||
*/
|
||||
@Data
|
||||
public class UserInvestmentVo {
|
||||
|
||||
|
|
|
|||
|
|
@ -2,58 +2,5 @@
|
|||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.hzs.member.base.mapper.CuMemberShareMapper">
|
||||
|
||||
<!-- 通用查询映射结果 -->
|
||||
<resultMap id="CuMemberShare" type="com.hzs.common.domain.member.base.CuMemberShare">
|
||||
<id column="PK_ID" property="pkId"/>
|
||||
<result column="DEL_FLAG" property="delFlag"/>
|
||||
<result column="PK_CREATOR" property="pkCreator"/>
|
||||
<result column="CREATION_TIME" property="creationTime"/>
|
||||
<result column="PK_MODIFIED" property="pkModified"/>
|
||||
<result column="MODIFIED_TIME" property="modifiedTime"/>
|
||||
<result column="MEMBER_CODE" property="memberCode"/>
|
||||
<result column="MEMBER_NAME" property="memberName"/>
|
||||
<result column="PHONE" property="phone"/>
|
||||
<result column="PK_PARENT" property="pkParent"/>
|
||||
<result column="LOGIN_PWD" property="loginPwd"/>
|
||||
<result column="LOGIN_PASSWORD" property="loginPassword"/>
|
||||
<result column="PAY_FLAG" property="payFlag"/>
|
||||
<result column="PK_COUNTRY" property="pkCountry"/>
|
||||
</resultMap>
|
||||
|
||||
<select id="seaFlourList" resultType="com.hzs.member.marketnews.vo.SeaFlourVo">
|
||||
select ms.MEMBER_CODE memberCode,ms.MEMBER_NAME memberName,ms.PHONE phone,ms.CREATION_TIME creationTime,
|
||||
ms.pk_vertex,
|
||||
ms.service_code,
|
||||
ms.nick_name
|
||||
from CU_MEMBER ms
|
||||
inner join bd_grade bg
|
||||
on ms.pk_settle_grade = bg.pk_id
|
||||
where 1= 1 and bg.grade_value= 20
|
||||
and
|
||||
(
|
||||
(select count(so.PK_ID) from sa_order so where so.PK_CREATOR = ms.pk_id and so.del_flag = 0 and so.ORDER_STATUS = 1) = 0
|
||||
and
|
||||
(select count(sto.PK_ID) from sa_t_order sto where sto.PK_CREATOR = ms.pk_id and sto.del_flag = 0 and sto.ORDER_STATUS = 1) = 0
|
||||
)
|
||||
<if test="pkMember != null">
|
||||
and ms.PK_PARENT = #{pkMember}
|
||||
</if>
|
||||
<if test="memberInfo != null and memberInfo != ''">
|
||||
and (ms.MEMBER_NAME=#{memberInfo} or ms.MEMBER_CODE=#{memberInfo})
|
||||
</if>
|
||||
<if test="memberCode != null and memberCode != ''">
|
||||
and (ms.member_code = #{memberCode} or ms.SERVICE_CODE = #{memberCode})
|
||||
</if>
|
||||
<if test="memberName != null and memberName != ''">
|
||||
and (ms.member_name = #{memberName} or ms.NICK_NAME = #{memberName})
|
||||
</if>
|
||||
<if test="startCreationTime != null">
|
||||
and ms.CREATION_TIME >= #{startCreationTime}
|
||||
</if>
|
||||
<if test="endCreationTime != null">
|
||||
and ms.CREATION_TIME < #{endCreationTime}
|
||||
</if>
|
||||
order by ms.CREATION_TIME desc
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ public enum ELoginType {
|
|||
MEMBER("1", 1, "会员", 0, EnumsPrefixConstants.LOGINTYPE + "1"),
|
||||
|
||||
/**
|
||||
* 分享会员（海粉）
|
||||
* 分享会员（188）
|
||||
*/
|
||||
SHARE_MEMBER("2", 2, "分享会员", 0, EnumsPrefixConstants.LOGINTYPE + "2"),
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue