中台 律师注销列表 商户注销列表状态修改

alien-entity/src/main/java/shop/alien/entity/store/vo/LawyerUserLogoutListVo.java

@@ -37,8 +37,8 @@ public class LawyerUserLogoutListVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date logoutFinishTime;
 
-    @ApiModelProperty(value = "状态：-1注销中，2已注销")
-    private Integer status;
+    @ApiModelProperty(value = "注销标记：0正常，1已注销，2注销冷静期")
+    private Integer logoutFlag;
 
     @ApiModelProperty(value = "状态文案：注销中/已注销")
     private String statusName;

alien-entity/src/main/java/shop/alien/entity/store/vo/StoreUserLogoutListVo.java

@@ -40,8 +40,8 @@ public class StoreUserLogoutListVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date logoutFinishTime;
 
-    @ApiModelProperty(value = "状态：-1注销中，2已注销")
-    private Integer status;
+    @ApiModelProperty(value = "注销标记：0正常，1已注销，2注销冷静期")
+    private Integer logoutFlag;
 
     @ApiModelProperty(value = "状态文案：注销中/已注销")
     private String statusName;

alien-entity/src/main/java/shop/alien/mapper/LawyerUserMapper.java

@@ -149,7 +149,7 @@ Integer updateLawyerUser(LawyerUser user);
     IPage<LawyerUser> selectLogoutPage(IPage<LawyerUser> page,
                                        @Param("name") String name,
                                        @Param("phone") String phone,
-                                       @Param("status") Integer status);
+                                       @Param("logoutFlag") Integer logoutFlag);
 
 }
 

alien-entity/src/main/resources/mapper/LawyerUserMapper.xml

@@ -143,11 +143,10 @@
         SELECT
             id, phone, name, created_time, updated_time, logout_flag, logout_reason, logout_time, delete_flag, status
         FROM lawyer_user
-        WHERE logout_flag = 1
+        WHERE logout_flag IN (1, 2)
         <if test="name != null and name != ''">AND name LIKE CONCAT('%', #{name}, '%')</if>
         <if test="phone != null and phone != ''">AND phone LIKE CONCAT('%', #{phone}, '%')</if>
-        <if test="status != null and status == -1">AND (delete_flag = 0 OR delete_flag IS NULL)</if>
-        <if test="status != null and status == 2">AND delete_flag = 1</if>
+        <if test="logoutFlag != null">AND logout_flag = #{logoutFlag}</if>
         ORDER BY logout_time DESC, created_time DESC
     </select>
 

alien-store/src/main/java/shop/alien/store/controller/LawyerUserController.java

@@ -240,7 +240,7 @@ public class LawyerUserController {
             @ApiImplicitParam(name = "pageSize", value = "页大小", dataType = "int", paramType = "query", defaultValue = "10"),
             @ApiImplicitParam(name = "name", value = "律师姓名（lawyer_user.name）", dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "phone", value = "手机号", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "status", value = "状态：-1注销中，2已注销", dataType = "int", paramType = "query")
+            @ApiImplicitParam(name = "logoutFlag", value = "注销标记：1已注销，2注销冷静期", dataType = "int", paramType = "query")
     })
     @GetMapping("/lawyer_user")
     public R<IPage<LawyerUserLogoutListVo>> getLawyerUserLogoutPage(
@@ -248,10 +248,10 @@ public class LawyerUserController {
             @RequestParam(defaultValue = "10") int pageSize,
             @RequestParam(required = false) String name,
             @RequestParam(required = false) String phone,
-            @RequestParam(required = false) Integer status) {
-        log.info("LawyerUserController.getLawyerUserLogoutPage?pageNum={},pageSize={},name={},phone={},status={}",
-                pageNum, pageSize, name, phone, status);
-        return R.data(lawyerUserService.getLawyerUserLogoutPage(pageNum, pageSize, name, phone, status));
+            @RequestParam(required = false) Integer logoutFlag) {
+        log.info("LawyerUserController.getLawyerUserLogoutPage?pageNum={},pageSize={},name={},phone={},logoutFlag={}",
+                pageNum, pageSize, name, phone, logoutFlag);
+        return R.data(lawyerUserService.getLawyerUserLogoutPage(pageNum, pageSize, name, phone, logoutFlag));
     }
 
     @ApiOperation("导出中台律师列表")

alien-store/src/main/java/shop/alien/store/controller/StoreInfoController.java

@@ -638,7 +638,7 @@ public class StoreInfoController {
             @ApiImplicitParam(name = "pageSize", value = "页大小", dataType = "int", paramType = "query", defaultValue = "10"),
             @ApiImplicitParam(name = "userName", value = "用户名（store_user.name）", dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "phone", value = "手机号", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "status", value = "状态：-1注销中，2已注销", dataType = "int", paramType = "query")
+            @ApiImplicitParam(name = "logoutFlag", value = "注销标记：1已注销，2注销冷静期", dataType = "int", paramType = "query")
     })
     @GetMapping("/store_user")
     public R<IPage<StoreUserLogoutListVo>> getStoreUserLogoutPage(
@@ -646,10 +646,10 @@ public class StoreInfoController {
             @RequestParam(defaultValue = "10") int pageSize,
             @RequestParam(required = false) String userName,
             @RequestParam(required = false) String phone,
-            @RequestParam(required = false) Integer status) {
-        log.info("StoreInfoController.getStoreUserLogoutPage?pageNum={},pageSize={},userName={},phone={},status={}",
-                pageNum, pageSize, userName, phone, status);
-        return R.data(storeUserService.getStoreUserLogoutPage(pageNum, pageSize, userName, phone, status));
+            @RequestParam(required = false) Integer logoutFlag) {
+        log.info("StoreInfoController.getStoreUserLogoutPage?pageNum={},pageSize={},userName={},phone={},logoutFlag={}",
+                pageNum, pageSize, userName, phone, logoutFlag);
+        return R.data(storeUserService.getStoreUserLogoutPage(pageNum, pageSize, userName, phone, logoutFlag));
     }
 
     /**

alien-store/src/main/java/shop/alien/store/service/LawyerUserService.java

@@ -153,6 +153,6 @@ public interface LawyerUserService extends IService<LawyerUser> {
      *
      * @param name 律师姓名（lawyer_user.name 模糊）
      */
-    IPage<LawyerUserLogoutListVo> getLawyerUserLogoutPage(int pageNum, int pageSize, String name, String phone, Integer status);
+    IPage<LawyerUserLogoutListVo> getLawyerUserLogoutPage(int pageNum, int pageSize, String name, String phone, Integer logoutFlag);
 }
 

alien-store/src/main/java/shop/alien/store/service/StoreUserService.java

@@ -204,7 +204,7 @@ public interface StoreUserService extends IService<StoreUser> {
      * @param pageSize 页大小
      * @param userName 用户名（store_user.name 模糊）
      * @param phone    手机号模糊
-     * @param status   状态：-1注销中，2已注销
+     * @param logoutFlag 注销标记：1已注销，2注销冷静期
      */
-    IPage<StoreUserLogoutListVo> getStoreUserLogoutPage(int pageNum, int pageSize, String userName, String phone, Integer status);
+    IPage<StoreUserLogoutListVo> getStoreUserLogoutPage(int pageNum, int pageSize, String userName, String phone, Integer logoutFlag);
 }

alien-store/src/main/java/shop/alien/store/service/impl/LawyerUserServiceImpl.java

@@ -578,9 +578,9 @@ public class LawyerUserServiceImpl extends ServiceImpl<LawyerUserMapper, LawyerU
     }
 
     @Override
-    public IPage<LawyerUserLogoutListVo> getLawyerUserLogoutPage(int pageNum, int pageSize, String name, String phone, Integer status) {
+    public IPage<LawyerUserLogoutListVo> getLawyerUserLogoutPage(int pageNum, int pageSize, String name, String phone, Integer logoutFlag) {
         Page<LawyerUser> page = new Page<>(pageNum, pageSize);
-        IPage<LawyerUser> userPage = lawyerUserMapper.selectLogoutPage(page, name, phone, status);
+        IPage<LawyerUser> userPage = lawyerUserMapper.selectLogoutPage(page, name, phone, logoutFlag);
         Page<LawyerUserLogoutListVo> result = new Page<>(userPage.getCurrent(), userPage.getSize(), userPage.getTotal());
         result.setRecords(userPage.getRecords().stream().map(this::toLawyerUserLogoutListVo).collect(Collectors.toList()));
         return result;
@@ -595,18 +595,21 @@ public class LawyerUserServiceImpl extends ServiceImpl<LawyerUserMapper, LawyerU
         vo.setApplyLogoutTime(user.getLogoutTime());
         vo.setLogoutReason(user.getLogoutReason());
 
-        int rowStatus = resolveLawyerLogoutListStatus(user);
-        vo.setStatus(rowStatus);
-        vo.setStatusName(rowStatus == -1 ? "注销中" : "已注销");
-        vo.setLogoutFinishTime(rowStatus == 2 ? user.getLogoutTime() : null);
+        Integer flag = user.getLogoutFlag();
+        vo.setLogoutFlag(flag);
+        vo.setStatusName(resolveLawyerLogoutFlagName(flag));
+        vo.setLogoutFinishTime(flag != null && flag == 1 ? user.getLogoutTime() : null);
         return vo;
     }
 
-    private int resolveLawyerLogoutListStatus(LawyerUser user) {
-        if (user.getDeleteFlag() == null || user.getDeleteFlag() == 0) {
-            return -1;
+    private String resolveLawyerLogoutFlagName(Integer logoutFlag) {
+        if (logoutFlag != null && logoutFlag == 2) {
+            return "注销中";
         }
-        return 2;
+        if (logoutFlag != null && logoutFlag == 1) {
+            return "已注销";
+        }
+        return "";
     }
 }
 

alien-store/src/main/java/shop/alien/store/service/impl/StoreUserServiceImpl.java

@@ -1344,19 +1344,13 @@ public class StoreUserServiceImpl extends ServiceImpl<StoreUserMapper, StoreUser
     }
 
     @Override
-    public IPage<StoreUserLogoutListVo> getStoreUserLogoutPage(int pageNum, int pageSize, String userName, String phone, Integer status) {
+    public IPage<StoreUserLogoutListVo> getStoreUserLogoutPage(int pageNum, int pageSize, String userName, String phone, Integer logoutFlag) {
         Page<StoreUser> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<StoreUser> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(StoreUser::getDeleteFlag, 0)
-                .and(w -> w.eq(StoreUser::getLogoutFlag, 1)
-                        .or().eq(StoreUser::getStatus, -1)
-                        .or().eq(StoreUser::getStatus, 2));
-        if (status != null && status == -1) {
-            wrapper.eq(StoreUser::getStatus, -1);
-        } else if (status != null && status == 2) {
-            wrapper.and(w -> w.eq(StoreUser::getStatus, 2)
-                    .or(sub -> sub.eq(StoreUser::getLogoutFlag, 1)
-                            .and(inner -> inner.isNull(StoreUser::getStatus).or().ne(StoreUser::getStatus, -1))));
+                .in(StoreUser::getLogoutFlag, StoreUser.LOGOUT_FLAG_DONE, StoreUser.LOGOUT_FLAG_COOLING);
+        if (logoutFlag != null) {
+            wrapper.eq(StoreUser::getLogoutFlag, logoutFlag);
         }
         if (StringUtils.isNotEmpty(userName)) {
             wrapper.like(StoreUser::getName, userName);
@@ -1381,26 +1375,25 @@ public class StoreUserServiceImpl extends ServiceImpl<StoreUserMapper, StoreUser
         vo.setApplyLogoutTime(user.getLogoutTime());
         vo.setLogoutReason(user.getLogoutReason());
 
-        int rowStatus = resolveLogoutListStatus(user);
-        vo.setStatus(rowStatus);
-        vo.setStatusName(rowStatus == -1 ? "注销中" : "已注销");
-        vo.setLogoutFinishTime(resolveLogoutFinishTime(user, rowStatus));
+        Integer flag = user.getLogoutFlag();
+        vo.setLogoutFlag(flag);
+        vo.setStatusName(resolveLogoutFlagName(flag));
+        vo.setLogoutFinishTime(resolveLogoutFinishTime(user, flag));
         return vo;
     }
 
-    private int resolveLogoutListStatus(StoreUser user) {
-        if (user.getStatus() != null && user.getStatus() == -1) {
-            return -1;
+    private String resolveLogoutFlagName(Integer logoutFlag) {
+        if (logoutFlag != null && logoutFlag == StoreUser.LOGOUT_FLAG_COOLING) {
+            return "注销中";
         }
-        if ((user.getStatus() != null && user.getStatus() == 2)
-                || (user.getLogoutFlag() != null && user.getLogoutFlag() == 1)) {
-            return 2;
+        if (logoutFlag != null && logoutFlag == StoreUser.LOGOUT_FLAG_DONE) {
+            return "已注销";
         }
-        return user.getStatus() != null ? user.getStatus() : 0;
+        return "";
     }
 
-    private Date resolveLogoutFinishTime(StoreUser user, int rowStatus) {
-        if (rowStatus == -1 && user.getLogoutTime() != null) {
+    private Date resolveLogoutFinishTime(StoreUser user, Integer logoutFlag) {
+        if (logoutFlag != null && logoutFlag == StoreUser.LOGOUT_FLAG_COOLING && user.getLogoutTime() != null) {
             Calendar calendar = Calendar.getInstance();
             calendar.setTime(user.getLogoutTime());
             calendar.add(Calendar.DAY_OF_YEAR, 7);