From 0aa2dd71fa4b989838f89aff2cac82950a70097f Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期四, 22 八月 2024 18:10:48 +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 | 11 ++++++----- 1 files changed, 6 insertions(+), 5 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 23a6c33..693f779 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 @@ -98,8 +98,8 @@ @Autowired private EmpowerMapper empowerMapper; - @Autowired + private DeviceMapper deviceMapper; @Autowired @@ -152,7 +152,7 @@ //鍒涘缓绯荤粺鐧婚檰璐﹀彿锛堥粯璁ゆ棤浠讳綍瑙掕壊锛� if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){ //濡傛灉鏄唴閮ㄧ粍缁囦汉鍛橈紝鏂板绯荤粺鐧婚檰璐﹀彿 - systemUserMapper.insert(createSystemUser(insert)); + systemUserMapper.insert(createSystemUser(insert,systemDictDataBiz)); //澶勭悊鍩硅鏈夋晥鏈熶笟鍔� dealTrainTIme(member,0,loginUserInfo); } @@ -166,7 +166,7 @@ } return insert; } - private SystemUser createSystemUser(Member insert) { + public static SystemUser createSystemUser(Member insert,SystemDictDataBiz systemDictDataBiz) { SystemUser user = new SystemUser(); // 鐢熸垚瀵嗙爜鐩� String salt = RandomStringUtils.randomAlphabetic(6); @@ -186,6 +186,7 @@ user.setUpdateUser(insert.getEditor()); user.setUpdateTime(insert.getEditDate()); user.setMemberId(insert.getId()); + user.setSource(Constants.ZERO); user.setDeleted(Boolean.FALSE); user.setFixed(Boolean.FALSE); user.setStatus(Constants.ZERO); @@ -1589,7 +1590,7 @@ .eq(Member::getType,Constants.memberType.internal) .eq(Member::getStatus,Constants.ZERO) .isNotNull(Member::getHkId) - .apply("to_days(lastVisitDate)+ "+days+" < to_days(now())" )); + .apply("to_days(LAST_VISIT_DATE)+ "+days+" < to_days(now())" )); if(CollectionUtils.isEmpty(memberList)){ return; } @@ -1862,7 +1863,7 @@ //鍒涘缓绯荤粺鐧婚檰璐﹀彿锛堥粯璁ゆ棤浠讳綍瑙掕壊锛� if(Constants.equalsInteger(insert.getCompanyType(),Constants.ONE)){ //濡傛灉鏄唴閮ㄧ粍缁囦汉鍛橈紝鏂板绯荤粺鐧婚檰璐﹀彿 - userList.add(createSystemUser(insert)); + userList.add(createSystemUser(insert,systemDictDataBiz)); } } if(userList.size()>0){ -- Gitblit v1.9.3