From ecbdab9da9488cc58a1ac7064f9cffde4792fba4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 28 六月 2024 09:51:01 +0800
Subject: [PATCH] 代码初始化

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java |   32 ++++++++++++++++++++++----------
 1 files changed, 22 insertions(+), 10 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..4009bc7 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
@@ -544,6 +544,7 @@
     }
 
     @Override
+    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
     public void deleteById(Integer id,LoginUserInfo loginUserInfo) {
         Member member=new Member();
         member.setId(id);
@@ -553,6 +554,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 +803,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 +838,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 +1628,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 +2019,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