身份变更

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppShareholderDetail.java

@@ -47,4 +47,7 @@ public class AppShareholderDetail {
     @Column(name = "upd_time")
     private Long updTime;
 
+    @Column(name = "postion_id")
+    private Integer postionId;
+
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AppUserPositionTempVo.java

 package com.github.wxiaoqi.security.admin.vo;
 
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -21,6 +20,8 @@ public class AppUserPositionTempVo {
 
     private Integer id;
 
+    private Integer userId;
+
     @ApiModelProperty(value = "手机号码")
     private String phone;
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppShareholderDetailBiz.java

@@ -3,6 +3,15 @@ package com.github.wxiaoqi.security.admin.biz;
 import com.github.wxiaoqi.security.admin.entity.AppShareholderDetail;
 import com.github.wxiaoqi.security.admin.mapper.AppShareholderDetailMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
-
+/**
+ * @author zuoyihang
+ * @version 1.0
+ * @description
+ * @data 2019/12/21 19:52
+ */
 public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper, AppShareholderDetail> {
+
+    public Integer findShareholderByUserIdOrPhone(Integer userId, String phone) {
+        return  mapper.selectShareHolderByUserIdOrPhone(userId,phone);
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java

@@ -66,6 +66,9 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
     @Autowired
     AppUserPositionChangeRecordBiz appUserPositionChangeRecordBiz;
 
+    @Autowired
+    private AppShareholderDetailBiz appShareholderDetailBiz;
+
 
     public ObjectRestResponse add(AppUserPositionTempDTO appUserPositionTempDTO, Integer updUserId) {
         if (appUserPositionTempDTO == null || StringUtils.isBlank(appUserPositionTempDTO.getPhone()) || StringUtils.isBlank(appUserPositionTempDTO.getName())
@@ -413,9 +416,22 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         if (appUserDetail != null) {
             loginBiz.updateUserPosition(appUserDetail.getId(), appUserPositionTempDTO.getPositionId());
         }
-
-        if (StaffChangeStatusEnum.needChangePostionsStatus.contains(changeStatus)){
-
+        if (StaffChangeStatusEnum.needChangePostionsStatus.contains(changeStatus)) {
+            //1.查询股东表 根据userid 或 手机号
+            Integer postionId = appShareholderDetailBiz.findShareholderByUserIdOrPhone(appUserPositionTempDTO.getUserId(), appUserPositionTempDTO.getPhone());
+            //离职
+            if (StaffChangeStatusEnum.JOB_SEPARATION.getCode() == changeStatus) {
+                if (Objects.isNull(postionId)) {
+                    //更改为普通用户 6
+                    loginBiz.updateUserPosition(appUserDetail.getId(), 6);
+                }
+            }
+            //身份变更
+            if (StaffChangeStatusEnum.IDENTITY_CHANE.getCode() == changeStatus) {
+                postionId = Objects.nonNull(postionId) ? postionId : appUserPositionTempDTO.getPositionId();
+                //更改为股东身份
+                loginBiz.updateUserPosition(appUserDetail.getId(), postionId);
+            }
         }
 
         return ObjectRestResponse.succ();
@@ -436,7 +452,9 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         //用户表更改其身份
         AppUserDetail appUserDetail = detailBiz.checkeIsAppUser(userPositionTemp.getUserId());
         if (appUserDetail != null) {
-            loginBiz.updateUserPosition(appUserDetail.getId(), appUserPositionTempDTO.getPositionId());
+            Integer postionId = appShareholderDetailBiz.findShareholderByUserIdOrPhone(appUserPositionTempDTO.getUserId(), appUserPositionTempDTO.getPhone());
+            postionId = Objects.isNull(postionId) ? appUserPositionTempDTO.getPositionId() : postionId;
+            loginBiz.updateUserPosition(appUserDetail.getId(), postionId);
         }
         return ObjectRestResponse.succ();
     }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppShareholderDetailMapper.java

 package com.github.wxiaoqi.security.admin.mapper;
 
 import com.github.wxiaoqi.security.admin.entity.AppShareholderDetail;
+import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 /**
  * @author zuoyihang
@@ -9,4 +10,7 @@ import tk.mybatis.mapper.common.Mapper;
  * @data 2019/12/21 18:30
  */
 public interface AppShareholderDetailMapper extends Mapper<AppShareholderDetail> {
+
+    Integer selectShareHolderByUserIdOrPhone(@Param("userId") Integer userId,
+                                             @Param("phone") String phone);
 }

ace-modules/ace-admin/src/main/resources/mapper/AppShareholderDetailMapper.xml

@@ -11,5 +11,16 @@
 		<result property="crtTime" column="crt_time"/>
 		<result property="isQuit" column="is_quit"/>
 		<result property="updTime" column="upd_time"/>
+		<result property="postionId" column="postion_id"/>
 	</resultMap>
+
+	<select id="selectShareHolderByUserIdOrPhone" resultType="java.lang.Integer">
+		select  `postion_id` from `app_shareholder_detail` where 1=1
+		<if test="userId != null">
+		     or `user_id`#{userId}
+		</if>
+		<if test="phone != null and phone != ''">
+			or `phone`= #{phone}
+		</if>
+	</select>
 </mapper>
\ No newline at end of file