Merge branch 'feature/获取用户敏感信息' into 'developer'

Feature/获取用户敏感信息

See merge request !909

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffMapper.java

@@ -136,7 +136,7 @@ public interface StaffMapper {
     /**
      * 更新是否激活
      */
-    int updateActiveStatusById(@Param("wxOpenUserId")String wxOpenUserId, @Param("activeTime")Date activeTime, 
+    int updateActiveStatusById(@Param("staffId")String staffId, @Param("activeTime")Date activeTime, 
             @Param("expireTime")Date expireTime,
             @Param("activeCode")String activeCode, @Param("activeStatus")Integer activeStatus);
     

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffServiceImpl.java

@@ -174,9 +174,9 @@ public class StaffServiceImpl implements StaffService {
     }
     
     @Override
-    public int updateActiveStatusById(String wxOpenUserId,  Date activeTime, Date expireTime,
+    public int updateActiveStatusById(String staffId,  Date activeTime, Date expireTime,
             String activeCode, Integer activeStatus) {
-        return mapper.updateActiveStatusById(wxOpenUserId, activeTime, expireTime, activeCode , activeStatus) ;
+        return mapper.updateActiveStatusById(staffId, activeTime, expireTime, activeCode , activeStatus) ;
     }
     
     @Override
@@ -249,7 +249,15 @@ public class StaffServiceImpl implements StaffService {
             Date start = new Date(item.getActiveTime()*1000L) ;
             Date end = new Date(item.getExpireTime()*1000L) ;
             log.info("更新staff表,userId={}",userId);
-            this.updateActiveStatusById(userId , start, end, activeCode, 1) ;
+            TabHaobanStaff staff = this.mapper.selectByUserIdAndEnterpriseId(userId, wxEnterpriseId) ;
+            if(null == staff && end.getTime()>System.currentTimeMillis()) {
+                staff = this.mapper.getDeleteUser(userId, wxEnterpriseId) ;
+            }
+            if(null != staff) {
+                this.updateActiveStatusById(staff.getStaffId(), start, end, activeCode, 1) ;
+            }else {
+                log.info("查询激活账号,用户不存在,userid={}",userId);
+            }
             TabHaobanQywxFeeAccountStaff accountStaff = new TabHaobanQywxFeeAccountStaff();
             accountStaff.setFeeAccountStaffId(UniqueIdUtils.uniqueLong());
             accountStaff.setWxEnterpriseId(wxEnterpriseId);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/fee/HaobanQywxFeeApiServiceImpl.java

@@ -230,7 +230,7 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
                 int monthWillInterceptNum = haobanQywxFeeAccountStaffService.monthWillInterceptNum(wxEnterpriseId);
                 String content = "30天将有" + monthWillInterceptNum + "个接口许可证即将过期，您总共还剩余" + permissionUserNum + "个可用的接口许可证，请保证数量充足，如需增加请及时联系相关人员续费，避免影响使用";
                 //告警
-                messageAlert(wxEnterpriseId, corpName, corpid, AlertTypeEnum.FEE_ALARM.getName(), content);
+                // messageAlert(wxEnterpriseId, corpName, corpid, AlertTypeEnum.FEE_ALARM.getName(), content);
             }
         }
         

haoban-manage3-service/src/main/resources/mapper/StaffMapper.xml

@@ -504,7 +504,7 @@
   			`expire_time` = #{expireTime},
     		`active_code` = #{activeCode},
             update_time   = now()
-        where wx_open_user_id = #{wxOpenUserId}
+        where staff_id = #{staffId}
     </update>
     
     <update id="deleteActivieInfo">