From bf8d85d5f83c2036fb4239d764d33e99c1b62bd3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 14:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 2ba9c75..7f6b533 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -52,6 +52,8 @@
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.impl.hksync.HkSyncEmpowerServiceImpl;
import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl;
+import com.doumee.service.system.SystemLoginService;
+import com.doumee.service.system.SystemUserService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.RandomStringUtils;
@@ -1084,6 +1086,33 @@
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
queryWrapper.selectAll(Member.class)
.selectAs(Company::getName,Member::getCompanyName) ;
+ if(StringUtils.isNotBlank(member.getName())){
+ queryWrapper.like(Member::getName,member.getName());
+ }
+
+ if(null != member.getType()) {
+ queryWrapper.eq(Member::getType,member.getType());
+ }
+ if(null != member.getCompanyId()) {
+ queryWrapper.eq(Member::getCompanyId,member.getCompanyId());
+ }
+ queryWrapper.eq(Member::getIsdeleted,Constants.ZERO);
+ List<Member> list = memberJoinMapper.selectJoinList(Member.class,queryWrapper);
+ if(list!=null){
+ for(Member m : list){
+ m.setName(StringUtils.defaultString(m.getName(),"")+"-"+StringUtils.defaultString(m.getCompanyName(),""));
+ }
+ }
+ return list;
+ }
+ @Override
+ public List<Member> findDriveList(Member member) {
+ MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ queryWrapper.selectAll(Member.class)
+ .selectAs(Company::getName,Member::getCompanyName)
+ .eq(Member::getType,Constants.TWO)
+ .exists("select d.id from car_driver b where b.isdeleted=0 and b.member_id=t.id");
if(null != member.getType()) {
queryWrapper.eq(Member::getType,member.getType());
@@ -1589,6 +1618,7 @@
if(!Objects.isNull(tokenJson.get("access_token"))){
openId = tokenJson.getString("openid");
}
+// String openId = "12345";
WxAuthorizeVO wxAuthorizeVO = new WxAuthorizeVO();
wxAuthorizeVO.setOpenid(openId);
//鏍规嵁openId 鏌ヨ鐢ㄦ埛淇℃伅
@@ -1615,11 +1645,11 @@
String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
member.setPrefixUrl(prefixUrl);
- JwtPayLoad payLoad = new JwtPayLoad(Integer.toString(member.getId()));
- String token = JwtTokenUtil.generateToken(payLoad);
- //瀛樺偍token鑷硆edis
- RedisUtil.addObject(redisTemplate,Constants.RedisKeys.INTERNAL_TOKEN+"_"+member.getId(),token,Constants.RedisKeys.EXPIRE_TIME);
- wxAuthorizeVO.setToken(token);
+// JwtPayLoad payLoad = new JwtPayLoad(Integer.toString(member.getId()));
+// String token = JwtTokenUtil.generateToken(payLoad);
+// //瀛樺偍token鑷硆edis
+// RedisUtil.addObject(redisTemplate,Constants.RedisKeys.INTERNAL_TOKEN+"_"+member.getId(),token,Constants.RedisKeys.EXPIRE_TIME);
+// wxAuthorizeVO.setToken(token);
wxAuthorizeVO.setMember(member);
}
return wxAuthorizeVO;
@@ -1630,7 +1660,10 @@
@Override
public List<MemberVO> getVisitedMember(CheckVisitedDTO checkVisitedDTO){
- List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
+ List<Member> memberList = memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
+ .selectAll(Member.class)
+ .selectAs(Company::getName,Member::getCompanyName)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
.eq(StringUtils.isNotBlank(checkVisitedDTO.getMobile()),Member::getPhone,checkVisitedDTO.getMobile())
.eq(StringUtils.isNotBlank(checkVisitedDTO.getName()),Member::getName,checkVisitedDTO.getName())
.eq(Member::getIsdeleted,Constants.ZERO)
@@ -1690,6 +1723,7 @@
@Override
public WxAuthorizeVO accountLogin(AccountLoginDTO accountLoginDTO){
+ System.out.println(DESUtil.decrypt(Constants.EDS_PWD,"eIaPD5AR5DBuTBE9MW14QRG07IDKXCdh"));
if(accountLoginDTO.getAccount().length()!=18
//&&!IdcardUtil.isValidCard(accountLoginDTO.getAccount())
){
--
Gitblit v1.9.3