From 3a2ef8e35608d82b03f7287025929751668c72cb Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 28 六月 2024 16:31:18 +0800 Subject: [PATCH] 最新版本 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 43 ++++++++++++++++++++++++++++--------------- 1 files changed, 28 insertions(+), 15 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 2a2dd80..c3ecdd0 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 @@ -458,11 +458,12 @@ systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda() .set(SystemUser::getUpdateUser,member.getLoginUserInfo().getId()) .set(SystemUser::getUpdateTime,new Date()) - .set(StringUtils.isNotBlank(model.getFaceImg()),SystemUser::getAvatar,member.getFaceImg()) - .set(StringUtils.isNotBlank(model.getPhone()),SystemUser::getMobile,member.getPhone()) - .set(StringUtils.isNotBlank(model.getName()),SystemUser::getRealname,member.getName()) - .set(model.getCompanyId() !=null,SystemUser::getCompanyId,member.getCompanyId()) - .set(StringUtils.isNotBlank(model.getCode()),SystemUser::getEmpNo,member.getCode()) + .set(StringUtils.isNotBlank(member.getFaceImg()),SystemUser::getAvatar,member.getFaceImg()) + .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()) + .set(member.getCompanyId() !=null,SystemUser::getCompanyId,member.getCompanyId()) + .set(StringUtils.isNotBlank(member.getCode()),SystemUser::getEmpNo,member.getCode()) .eq(SystemUser::getMemberId,model.getId())); } if(Constants.equalsInteger(model.getCompanyType(),Constants.ZERO) @@ -544,6 +545,7 @@ } @Override + @Transactional(rollbackFor = {BusinessException.class,Exception.class}) public void deleteById(Integer id,LoginUserInfo loginUserInfo) { Member member=new Member(); member.setId(id); @@ -553,6 +555,17 @@ member.setHkStatus(Constants.ZERO); member.setRemark("浜哄憳宸插垹闄わ紝绛夊緟鍒犻櫎闂ㄧ鏉冮檺"); memberMapper.updateById(member); + + //鍒櫎绯荤粺鐧婚檰璐︽埛 + SystemUser user = new SystemUser(); + user.setMemberId(id); + systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda() + .eq(SystemUser::getMemberId,id) + .set(SystemUser::getDeleted,Boolean.TRUE) + .set(SystemUser::getUpdateUser,member.getEditor()) + .set(SystemUser::getUpdateTime,member.getEditDate()) + ); + saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper,JSONObject.toJSONString(member)); } @@ -791,8 +804,8 @@ } for (Integer id:ids) { Member member = memberMapper.selectById(id); - if(!Objects.isNull(member)&&member.getStatus()==Constants.ZERO){ - member.setStatus(Constants.TWO); + if(!Objects.isNull(member)&&member.getStatus()==Constants.TWO){ + member.setStatus(Constants.ZERO);//鎭㈠姝e父鐘舵�� member.setEditor(loginUserInfo.getId()); member.setEditDate(new Date()); member.setAuthStatus(Constants.ZERO);//鏈巿鏉� @@ -826,8 +839,8 @@ } for (Integer id:ids) { Member member = memberMapper.selectById(id); - if(!Objects.isNull(member)&&member.getStatus()==Constants.ZERO){ - member.setStatus(Constants.ONE);//鎭㈠姝e父鐘舵�� + if(!Objects.isNull(member)&&member.getStatus()==Constants.TWO){ + member.setStatus(Constants.ZERO);//鎭㈠姝e父鐘舵�� member.setEditor(loginUserInfo.getId()); member.setEditDate(new Date()); member.setAuthStatus(Constants.ZERO);//鏈巿鏉� @@ -1616,11 +1629,11 @@ String appSecret = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_SECRET).getCode(); String getTokenUrl = WXConstant.GET_USER_INFO_URL.replace("CODE", code) .replace("APPID", appId).replace("SECRET", appSecret); - JSONObject tokenJson = JSONObject.parseObject(HttpsUtil.get(getTokenUrl,true)); - String openId = null; - if(!Objects.isNull(tokenJson.get("access_token"))){ - openId = tokenJson.getString("openid"); - } +// JSONObject tokenJson = JSONObject.parseObject(HttpsUtil.get(getTokenUrl,true)); + String openId = code; +// if(!Objects.isNull(tokenJson.get("access_token"))){ +// openId = tokenJson.getString("openid"); +// } // String openId = "12345"; WxAuthorizeVO wxAuthorizeVO = new WxAuthorizeVO(); wxAuthorizeVO.setOpenid(openId); @@ -2007,7 +2020,7 @@ Member member = new Member(); member.setCreateDate(new Date()); member.setIsdeleted(Constants.ZERO); - member.setType(Constants.TWO); + member.setType(Constants.THREE); member.setName(registerDriverDTO.getName()); member.setPhone(registerDriverDTO.getPhone()); member.setStatus(Constants.ZERO); -- Gitblit v1.9.3