From f63d3a3be83fea258e7920efccd2567b6a511bb3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 16 一月 2025 16:52:46 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 142 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 111 insertions(+), 31 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 0f64ff0..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
@@ -196,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;
}
@@ -224,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())));
@@ -482,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())
@@ -511,6 +514,8 @@
//濡傛灉浜鸿劯娌″彉鍖�
member.setFaceImg(null);
}
+
+ member.setPinyin(Constants.getChinesePingyin(member.getName()));
return model;
}
@@ -897,7 +902,7 @@
loginUserInfo = updateMember.getLoginUserInfo();
}
//鏍￠獙鍙傛暟 骞朵笖鏇存柊systemuser 鎵嬫満鍙峰拰宸ュ彿淇℃伅锛堝鏋滈渶瑕佷慨鏀圭殑璇濓級
- Member model = isMemberUpdateParamValid(updateMember);
+ Member model = isMemberUpdateParamValid(updateMember);
updateMember.setEditor(loginUserInfo.getId());
updateMember.setEditDate(new Date());
//娴峰悍浜哄憳鏂板涓氬姟
@@ -912,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)
@@ -1162,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){
@@ -1188,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){
@@ -1195,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
@@ -1432,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());
@@ -1538,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{
@@ -1576,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);
@@ -1669,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;
}
@@ -1735,8 +1785,11 @@
}else if(source == 3){
//澶勭悊tms绠℃帶浜哄憳鑷姩鎺堟潈閫昏緫
dealGkUserAuthBiz(wxAuthorizeVO,openId,source);
+ }else if(source == 0){
+ //濡傛灉鏄徃鏈猴紝鍒欎粠system_user鏌ヨ
+ dealDriverUserAuthBiz(wxAuthorizeVO,openId,source);
}else{
- //濡傛灉鏄徃鏈烘垨鑰呭唴閮ㄤ汉鍛橈紝鍒欎粠system_user鏌ヨ
+ //濡傛灉鏄唴閮ㄤ汉鍛橈紝鍒欎粠system_user鏌ヨ
dealSystemUserAuthBiz(wxAuthorizeVO,openId,source);
}
return wxAuthorizeVO;
@@ -1745,17 +1798,48 @@
private void dealSystemUserAuthBiz(WxAuthorizeVO wxAuthorizeVO, String openId, Integer source) {
SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
.eq(SystemUser::getOpenid,openId)
- .eq(Objects.nonNull(source)&&Constants.equalsInteger(source,Constants.TWO),SystemUser::getType,source)
+ .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.getIsdeleted() == Constants.ONE){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
+ if(member == null || member.getIsdeleted() == Constants.ONE){
+ return;
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
}
if(member.getStatus() != Constants.ZERO){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
+ 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()));
@@ -1775,7 +1859,7 @@
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(Objects.nonNull(source)&&Constants.equalsInteger(source,Constants.TWO),SystemUser::getType,source)
.eq(SystemUser::getDeleted,Boolean.FALSE)
.last(" limit 1 "));
//闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
@@ -1784,21 +1868,13 @@
tp.setTel(user.getMobile());
TmsEmployeeListResponse response = tmsService.getEmployeeList(tp);
if(response == null || response.getTel()==null){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヨ处鎴蜂汉鍛樹俊鎭笉姝ｇ‘锛屽鏈夌枒闂鑱旂郴绯荤粺绠＄悊鍛樻煡鐪嬶紒");
+ return;
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヨ处鎴蜂汉鍛樹俊鎭笉姝ｇ‘锛屽鏈夌枒闂鑱旂郴绯荤粺绠＄悊鍛樻煡鐪嬶紒");
}
- 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);
+
+ Member member = new Member();
+ member.setPhone(user.getMobile());
+// member.setId(user.getId());
wxAuthorizeVO.setMember(member);
//鍙告満 涓� 鍐呴儴浜哄憳 鎻愪緵token
String token = systemLoginService.loginByUserId(user.getId());
@@ -1820,10 +1896,12 @@
//闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
if(!Objects.isNull(member)){
if(member.getIsdeleted() == Constants.ONE){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
+ return;
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
}
if(member.getStatus() != Constants.ZERO){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
+ return;
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
}
if(StringUtils.isNotBlank(member.getIdcardNo())){
member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo()));
@@ -1860,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)) {
@@ -1896,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() +
@@ -2147,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(),"鎵嬫満鍙峰凡娉ㄥ唽!");
@@ -2160,7 +2240,7 @@
};
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