From 563966210b041d0223ab004a3063029bf0c5378a Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 06 二月 2025 09:20:45 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 285 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 207 insertions(+), 78 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 e2dcb08..811936b 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
@@ -19,9 +19,10 @@
import com.doumee.core.haikang.model.param.respose.UserAddResponse;
import com.doumee.core.haikang.model.param.respose.UserDelResponse;
import com.doumee.core.haikang.service.HKService;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.TmsService;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.*;
import com.doumee.core.wx.WXConstant;
import com.doumee.dao.admin.request.LaborEmpowerDTO;
@@ -31,11 +32,13 @@
import com.doumee.dao.admin.response.StagingDataVO;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dto.RegisterDriverDTO;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.join.RetentionJoinMapper;
import com.doumee.dao.business.join.UserActionJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.system.model.SystemUser;
@@ -47,6 +50,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.business.third.model.request.TmsEmployeeListRequest;
+import com.doumee.service.business.third.model.response.TmsEmployeeListResponse;
import com.doumee.service.system.SystemLoginService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.collections.CollectionUtils;
@@ -116,6 +121,8 @@
@Autowired
private VisitsMapper visitsMapper;
+ @Autowired
+ private TmsService tmsService;
@Autowired
private SystemUserMapper systemUserMapper;
@@ -189,6 +196,7 @@
user.setSource(Constants.ZERO);
user.setDeleted(Boolean.FALSE);
user.setFixed(Boolean.FALSE);
+ user.setPinyin(Constants.getChinesePingyin(user.getRealname()));
user.setStatus(Constants.ZERO);
return user;
}
@@ -217,6 +225,7 @@
insert.setSex(Constants.getSexByCardNo( member.getIdcardNo()));//鏍规嵁韬唤璇佸彿鑾峰彇鎬у埆
insert.setJobDate(member.getJobDate());
insert.setIsDangyuan(member.getIsDangyuan());
+ insert.setPinyin(Constants.getChinesePingyin(member.getName()));
insert.setPositionId(member.getPositionId());
if(StringUtils.isNotBlank(member.getIdcardNo())){
insert.setBirthday( DateUtil.fromStringToDate("yyyyMMdd",IdcardUtil.getBirthByIdCard(member.getIdcardNo())));
@@ -475,6 +484,7 @@
.set(SystemUser::getUpdateUser,member.getLoginUserInfo().getId())
.set(SystemUser::getUpdateTime,new Date())
.set(StringUtils.isNotBlank(member.getFaceImg()),SystemUser::getAvatar,member.getFaceImg())
+ .set(StringUtils.isNotBlank(member.getName()),SystemUser::getPinyin,Constants.getChinesePingyin(member.getName()))
.set(StringUtils.isNotBlank(member.getPhone()),SystemUser::getMobile,member.getPhone())
.set(StringUtils.isNotBlank(member.getPhone()),SystemUser::getUsername,member.getPhone())
.set(StringUtils.isNotBlank(member.getName()),SystemUser::getRealname,member.getName())
@@ -504,6 +514,8 @@
//濡傛灉浜鸿劯娌″彉鍖�
member.setFaceImg(null);
}
+
+ member.setPinyin(Constants.getChinesePingyin(member.getName()));
return model;
}
@@ -890,7 +902,7 @@
loginUserInfo = updateMember.getLoginUserInfo();
}
//鏍￠獙鍙傛暟 骞朵笖鏇存柊systemuser 鎵嬫満鍙峰拰宸ュ彿淇℃伅锛堝鏋滈渶瑕佷慨鏀圭殑璇濓級
- Member model = isMemberUpdateParamValid(updateMember);
+ Member model = isMemberUpdateParamValid(updateMember);
updateMember.setEditor(loginUserInfo.getId());
updateMember.setEditDate(new Date());
//娴峰悍浜哄憳鏂板涓氬姟
@@ -905,6 +917,7 @@
.set(StringUtils.isNotBlank(updateMember.getName()),Member::getName,updateMember.getName())
.set(Member::getEditDate,updateMember.getEditDate())
.set(Member::getEditor,updateMember.getEditor())
+ .set(StringUtils.isNotBlank(updateMember.getName()),Member::getPinyin,Constants.getChinesePingyin(updateMember.getName()))
.set(StringUtils.isNotBlank(updateMember.getIdcardNo()),Member::getIdcardNo,updateMember.getIdcardNo())
.set(StringUtils.isNotBlank(updateMember.getIdcardDecode()),Member::getIdcardDecode,updateMember.getIdcardDecode())
.set( Member::getAuthStatus,Constants.ZERO)
@@ -1155,6 +1168,7 @@
}
queryWrapper.eq(Member::getIsdeleted,Constants.ZERO);
queryWrapper.eq(Member::getWorkStatus,Constants.ZERO);
+ queryWrapper.orderByAsc(Member::getPinyin);
List<Member> list = memberJoinMapper.selectJoinList(Member.class,queryWrapper);
// if(list!=null){
// for(Member m : list){
@@ -1181,6 +1195,7 @@
queryWrapper.eq(Member::getCompanyId,member.getCompanyId());
}
queryWrapper.eq(Member::getIsdeleted,Constants.ZERO);
+ queryWrapper.orderByAsc(Member::getPinyin);
List<Member> list = memberJoinMapper.selectJoinList(Member.class,queryWrapper);
if(list!=null){
for(Member m : list){
@@ -1188,6 +1203,46 @@
}
}
return list;
+ }
+ @Override
+ public void initPinyinTool(){
+ MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
+ List<Member> list = memberJoinMapper.selectList(queryWrapper);
+ if(list!=null){
+ for(Member m : list){
+ if(m.getName()!=null){
+ Member u = new Member();
+ u.setId(m.getId());
+ u.setPinyin(Constants.getChinesePingyin(m.getName()));
+ memberMapper.updateById(u);
+ }
+ }
+ }
+
+ MPJLambdaWrapper<SystemUser> q1 = new MPJLambdaWrapper<>();
+ List<SystemUser> list1 = systemUserMapper.selectList(q1);
+ if(list1!=null){
+ for(SystemUser m : list1){
+ if(m.getRealname()!=null){
+ SystemUser u = new SystemUser();
+ u.setId(m.getId());
+ u.setPinyin(Constants.getChinesePingyin(m.getRealname()));
+ systemUserMapper.updateById(u);
+ }
+ }
+ }
+ MPJLambdaWrapper<Company> q2 = new MPJLambdaWrapper<>();
+ List<Company> list2 = companyMapper.selectList(q2);
+ if(list2!=null){
+ for(Company m : list2){
+ if(m.getName()!=null){
+ Company u = new Company();
+ u.setId(m.getId());
+ u.setPinyin(Constants.getChinesePingyin(m.getName()));
+ companyMapper.updateById(u);
+ }
+ }
+ }
}
@Override
@@ -1425,7 +1480,7 @@
// .eq(Member::getStatus,Constants.Status.ENABLE.getValue())
// .eq(Member::getType,Constants.memberType.internal)
.eq(pageWrap.getModel().getHkStatus()!=null,Member::getHkStatus,pageWrap.getModel().getHkStatus())
- .orderByDesc(!Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getCreateDate)
+ .orderByAsc(!Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getPinyin)
.orderByDesc(Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getEditDate);
if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())==DataSyncConfig.origin.erp){
queryWrapper.eq( StringUtils.isNotBlank(pageWrap.getModel().getErpOrgId()),Member::getErpOrgId,pageWrap.getModel().getErpOrgId());
@@ -1531,7 +1586,7 @@
.eq(Objects.nonNull(pageWrap.getModel().getStatus()),Member::getStatus,pageWrap.getModel().getStatus())
.eq(Member::getType,Constants.memberType.visitor)
.eq(Member::getIsdeleted,Constants.ZERO)
- .orderByDesc(Member::getCreateDate);
+ .orderByAsc(Member::getPinyin);
if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())==DataSyncConfig.origin.erp){
queryWrapper.eq( StringUtils.isNotBlank(pageWrap.getModel().getErpOrgId()),Member::getErpOrgId,pageWrap.getModel().getErpOrgId());
}else{
@@ -1569,7 +1624,7 @@
queryWrapper.selectAs(Position::getName,Member::getPositionName);
queryWrapper.leftJoin(Position.class,Position::getId,Member::getPositionId);
-
+ queryWrapper.orderByAsc(Member::getPinyin);
IPage<Member> memberIPage = memberJoinMapper.selectJoinPage(page, Member.class,queryWrapper);
return PageData.from(memberIPage);
@@ -1662,9 +1717,11 @@
.leftJoin(Company.class,Company::getId,Member::getCompanyId)
.eq(Member::getIsdeleted,Constants.ZERO)
.eq(Company::getType,Constants.ZERO)
- .eq(Member::getStatus,Constants.ZERO)
+ .eq(Member::getStatus,Constants.ZERO
+ )
.isNotNull(Member::getHkId)
- .apply("to_days(LAST_VISIT_DATE)+ "+days+" < to_days(now())" ));
+ .apply("to_days(LAST_VISIT_DATE)+ "+days+" < to_days(now())" )
+ .orderByAsc(Member::getPinyin));
if(CollectionUtils.isEmpty(memberList)){
return;
}
@@ -1718,81 +1775,152 @@
openId = tokenJson.getString("openid");
}
WxAuthorizeVO wxAuthorizeVO = new WxAuthorizeVO();
- wxAuthorizeVO.setOpenid(openId);
if(StringUtils.isBlank(openId)){
return wxAuthorizeVO;
}
+ wxAuthorizeVO.setOpenid(openId);
if(source==1){
- //鏍规嵁openId 鏌ヨ鐢ㄦ埛淇℃伅
- Member member = memberJoinMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>()
- .selectAll(Member.class)
- .selectAs(Company::getName,Member::getCompanyName)
- .leftJoin(Company.class,Company::getId,Member::getCompanyId)
- .eq(Member::getOpenid,openId)
- .eq(Member::getType,source)
- .eq(Member::getIsdeleted,Constants.ZERO)
- .orderByDesc(Member::getCreateDate)
- .last(" limit 1 ")
- );
- //闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
- if(!Objects.isNull(member)){
- if(member.getIsdeleted() == Constants.ONE){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
- }
- if(member.getStatus() != Constants.ZERO){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
- }
- if(StringUtils.isNotBlank(member.getIdcardNo())){
- member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo()));
- }
- String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
- systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
- member.setPrefixUrl(prefixUrl);
- wxAuthorizeVO.setMember(member);
- //鍙告満 涓� 鍐呴儴浜哄憳 鎻愪緵token
- if(Constants.equalsInteger(source,Constants.ZERO)||Constants.equalsInteger(source,Constants.TWO)){
- SystemUser systemUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda().eq(SystemUser::getMemberId,member.getId())
- .eq(SystemUser::getStatus,Constants.ZERO).last(" limit 1 "));
- if(Objects.nonNull(systemUser)){
- String token = systemLoginService.loginByUserId(systemUser.getId());
- wxAuthorizeVO.setToken(token);
- }
- }
- }
+ //澶勭悊鏅�氳瀹汉鍛樿嚜鍔ㄦ巿鏉冮�昏緫
+ dealVisitUserAuthBiz(wxAuthorizeVO,openId,source);
+ }else if(source == 3){
+ //澶勭悊tms绠℃帶浜哄憳鑷姩鎺堟潈閫昏緫
+ dealGkUserAuthBiz(wxAuthorizeVO,openId,source);
+ }else if(source == 0){
+ //濡傛灉鏄徃鏈猴紝鍒欎粠system_user鏌ヨ
+ dealDriverUserAuthBiz(wxAuthorizeVO,openId,source);
}else{
- //濡傛灉鏄徃鏈烘垨鑰呭唴閮ㄤ汉鍛橈紝鍒欎粠system_user鏌ヨ
- SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
- .eq(SystemUser::getOpenid,openId)
- .eq(SystemUser::getType,source)
- .eq(SystemUser::getDeleted,Boolean.FALSE)
- .last(" limit 1 "));
- //闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
- if(!Objects.isNull(user)){
- Member member = memberMapper.selectById(user.getMemberId());
- if(member.getIsdeleted() == Constants.ONE){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
- }
- if(member.getStatus() != Constants.ZERO){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
- }
- if(StringUtils.isNotBlank(member.getIdcardNo())){
- member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo()));
- }
- String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
- systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
- member.setPrefixUrl(prefixUrl);
- wxAuthorizeVO.setMember(member);
- //鍙告満 涓� 鍐呴儴浜哄憳 鎻愪緵token
- String token = systemLoginService.loginByUserId(user.getId());
- wxAuthorizeVO.setToken(token);
- }
+ //濡傛灉鏄唴閮ㄤ汉鍛橈紝鍒欎粠system_user鏌ヨ
+ dealSystemUserAuthBiz(wxAuthorizeVO,openId,source);
}
-
-
return wxAuthorizeVO;
}
+ private void dealSystemUserAuthBiz(WxAuthorizeVO wxAuthorizeVO, String openId, Integer source) {
+ SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getOpenid,openId)
+ .in(SystemUser::getType,Constants.memberType.internal)
+ .eq(SystemUser::getDeleted,Boolean.FALSE)
+ .last(" limit 1 "));
+ //闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
+ if(!Objects.isNull(user)){
+ Member member = memberMapper.selectById(user.getMemberId());
+ if(member == null || member.getIsdeleted() == Constants.ONE){
+ return;
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
+ }
+ if(member.getStatus() != Constants.ZERO){
+ return;
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
+ }
+ if(StringUtils.isNotBlank(member.getIdcardNo())){
+ member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo()));
+ }
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+ member.setPrefixUrl(prefixUrl);
+ wxAuthorizeVO.setMember(member);
+ //鍙告満 涓� 鍐呴儴浜哄憳 鎻愪緵token
+ String token = systemLoginService.loginByUserId(user.getId());
+ wxAuthorizeVO.setToken(token);
+ }
+ }
+ private void dealDriverUserAuthBiz(WxAuthorizeVO wxAuthorizeVO, String openId, Integer source) {
+ SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getOpenid,openId)
+ .in(SystemUser::getType,Constants.memberType.internal,Constants.memberType.driver)
+ .eq(SystemUser::getDeleted,Boolean.FALSE)
+ .last(" limit 1 "));
+ //闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
+ if(!Objects.isNull(user)){
+ Member member = memberMapper.selectById(user.getMemberId());
+ if(member == null || member.getIsdeleted() == Constants.ONE){
+ return;
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
+ }
+ if(member.getStatus() != Constants.ZERO){
+ return;
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
+ }
+ if(StringUtils.isNotBlank(member.getIdcardNo())){
+ member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo()));
+ }
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+ member.setPrefixUrl(prefixUrl);
+ wxAuthorizeVO.setMember(member);
+ //鍙告満 涓� 鍐呴儴浜哄憳 鎻愪緵token
+ String token = systemLoginService.loginByUserId(user.getId());
+ wxAuthorizeVO.setToken(token);
+ }
+ }
+ private void dealGkUserAuthBiz(WxAuthorizeVO wxAuthorizeVO, String openId, Integer source) {
+ //濡傛灉鏄徃鏈烘垨鑰呭唴閮ㄤ汉鍛橈紝鍒欎粠system_user鏌ヨ
+ SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getOpenid,openId)
+ .eq(SystemUser::getType,source)
+// .eq(Objects.nonNull(source)&&Constants.equalsInteger(source,Constants.TWO),SystemUser::getType,source)
+ .eq(SystemUser::getDeleted,Boolean.FALSE)
+ .last(" limit 1 "));
+ //闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
+ if(!Objects.isNull(user)){
+ TmsEmployeeListRequest tp = new TmsEmployeeListRequest();
+ tp.setTel(user.getMobile());
+ TmsEmployeeListResponse response = tmsService.getEmployeeList(tp);
+ if(response == null || response.getTel()==null){
+ return;
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヨ处鎴蜂汉鍛樹俊鎭笉姝ｇ‘锛屽鏈夌枒闂鑱旂郴绯荤粺绠＄悊鍛樻煡鐪嬶紒");
+ }
+
+ Member member = new Member();
+ member.setPhone(user.getMobile());
+// member.setId(user.getId());
+ wxAuthorizeVO.setMember(member);
+ //鍙告満 涓� 鍐呴儴浜哄憳 鎻愪緵token
+ String token = systemLoginService.loginByUserId(user.getId());
+ wxAuthorizeVO.setToken(token);
+ }
+ }
+
+ private void dealVisitUserAuthBiz(WxAuthorizeVO wxAuthorizeVO, String openId,Integer source) {
+ Member member = memberJoinMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>()
+ .selectAll(Member.class)
+ .selectAs(Company::getName,Member::getCompanyName)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .eq(Member::getOpenid,openId)
+ .eq(Member::getType,source)
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ .orderByDesc(Member::getCreateDate)
+ .last(" limit 1 ")
+ );
+ //闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
+ if(!Objects.isNull(member)){
+ if(member.getIsdeleted() == Constants.ONE){
+ return;
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
+ }
+ if(member.getStatus() != Constants.ZERO){
+ return;
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
+ }
+ if(StringUtils.isNotBlank(member.getIdcardNo())){
+ member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo()));
+ }
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+ member.setPrefixUrl(prefixUrl);
+ wxAuthorizeVO.setMember(member);
+ //鍙告満 涓� 鍐呴儴浜哄憳 鎻愪緵token
+ if(Constants.equalsInteger(source,Constants.ZERO)||Constants.equalsInteger(source,Constants.TWO)){
+ SystemUser systemUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda().eq(SystemUser::getMemberId,member.getId())
+ .eq(SystemUser::getStatus,Constants.ZERO).last(" limit 1 "));
+ if(Objects.nonNull(systemUser)){
+ String token = systemLoginService.loginByUserId(systemUser.getId());
+ wxAuthorizeVO.setToken(token);
+ }
+ }
+ }
+ }
@Override
@@ -1810,6 +1938,7 @@
.eq(Member::getWorkStatus,Constants.ZERO)
.eq(Member::getCanVisit,Constants.ONE)
.eq(Company::getType,Constants.ONE)
+ .orderByAsc(Member::getPinyin)
);
List<MemberVO> memberVOList = new ArrayList<>();
if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)) {
@@ -1846,7 +1975,8 @@
queryWrapper.and(StringUtils.isNotBlank(visitMemberDTO.getName()), ms->ms.like(Member::getPhone,visitMemberDTO.getName())
.or().like(Member::getPhone,visitMemberDTO.getName()));
}
- queryWrapper.orderByDesc(Visits::getCreateDate);
+ queryWrapper.orderByAsc(Member::getPinyin);
+// queryWrapper.orderByDesc(Visits::getCreateDate);
IPage<MemberVO> result = memberJoinMapper.selectJoinPage(page, MemberVO.class,queryWrapper);
String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
@@ -2097,7 +2227,7 @@
}
if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
.eq(Member::getIsdeleted,Constants.ZERO)
- .ne(Member::getType,Constants.memberType.visitor)
+ .in(Member::getType,Constants.memberType.gkuser,Constants.memberType.visitor)
.eq(Member::getPhone,registerDriverDTO.getPhone())
)>Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎵嬫満鍙峰凡娉ㄥ唽!");
@@ -2108,10 +2238,9 @@
)>Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎵嬫満鍙峰凡娉ㄥ唽!");
};
-
smsEmailService.validateCode(registerDriverDTO.getValidCode(),registerDriverDTO.getPhone());
String salt = RandomStringUtils.randomAlphabetic(6);
- ;
+
Member member = new Member();
member.setCreateDate(new Date());
member.setIsdeleted(Constants.ZERO);
--
Gitblit v1.9.3