将mo-sidecar接口挪至customer-service

src/main/java/cn/quantgroup/customer/rest/UserRest.java

@@ -156,11 +156,8 @@ public class UserRest {
     public JsonResult modifyUserDetail(@RequestParam(required = true) Long userId,
                                        @RequestParam(required = true) String realName,
                                        @RequestParam(required = true) String idNO) {
-        MoResult<String> result = userService.modifyUserDetail(userId, realName, idNO);
-        if(!result.isSuccess()){
-            return JsonResult.buildErrorStateResult(result.getMsg(),result.getData());
-        }
-        return JsonResult.buildSuccessResult(result.getMsg(),result.getData());
+        //MoResult<String> result = userService.modifyUserDetail(userId, realName, idNO);
+        return userService.modifyUserDetailNew(userId, realName, idNO);
     }
 
     /**
@@ -170,26 +167,29 @@ public class UserRest {
      */
     @PostMapping(value = "/pwd/reset")
     public JsonResult passwordReset(@RequestParam(required = true) String phone) {
-        MoResult<String> result  = userService.passwordRest(phone);
-        if(!result.isSuccess()){
-            return JsonResult.buildErrorStateResult(result.getMsg(),result.getData());
-        }
-        return JsonResult.buildSuccessResult(result.getMsg(),result.getData());
+        //MoResult<String> result  = userService.passwordRest(phone);
+        return userService.passwordRestNew(phone);
     }
 
     /**
-     * 修改用户账户状态(注销)
+     * 修改用户账户状态(注销)--更新为禁用
      *
      * @return
      */
     @PostMapping(value = "/modify/account/status/disable")
     public JsonResult modifyAccountStatusDisable(@RequestParam(required = true) Long userId) {
         //MoResult<Boolean> result = userService.modifyAccountStatusDisable(userId);
-        MoResult<Boolean> result = userService.modifyAccountStatusDisableNew(userId);
-        if(!result.isSuccess()){
-            return JsonResult.buildErrorStateResult(result.getMsg(),result.getData());
-        }
-        return JsonResult.buildSuccessResult(result.getMsg(),result.getData());
+        return userService.modifyAccountStatusDisableNew(userId);
+    }
+
+    /**
+     * 新增接口
+     * 注销账户，删除账户信息
+     * @return
+     */
+    @PostMapping(value = "/modify/account/delete")
+    public JsonResult deleteAccount(@RequestParam(required = true) Long userId) {
+        return userService.deleteAccount(userId);
     }
 
     /**
@@ -199,11 +199,8 @@ public class UserRest {
      */
     @PostMapping(value = "/modify/account/status/active")
     public JsonResult modifyAccountStatusActive(@RequestParam(required = true) Long userId) {
-        MoResult<Boolean> result = userService.modifyAccountStatusActive(userId);
-        if(!result.isSuccess()){
-            return JsonResult.buildErrorStateResult(result.getMsg(),result.getData());
-        }
-        return JsonResult.buildSuccessResult(result.getMsg(),result.getData());
+        //MoResult<Boolean> result = userService.modifyAccountStatusActive(userId);
+        return userService.modifyAccountStatusActiveNew(userId);
     }
 
 
@@ -267,6 +264,7 @@ public class UserRest {
     @PostMapping(value = "/search/userInfo")
     public JsonResult getBasicUserInfo(UserQueryParam userQueryParam) {
         JsonResult result = userService.findUserInfoByUserParam(userQueryParam);
+        //JsonResult result = userService.findUserInfoByUserParamNew(userQueryParam);
         if(!result.isSuccess()){
             return JsonResult.buildErrorStateResult(result.getMsg(),result.getData());
         }

src/main/java/cn/quantgroup/customer/service/IUserService.java

@@ -49,7 +49,7 @@ public interface IUserService extends UserDetailsService {
      * @param phoneNo
      * @return
      */
-    MoResult<String> passwordRestNew(String phoneNo);
+    JsonResult passwordRestNew(String phoneNo);
 
     /**
      * 注销账户
@@ -57,12 +57,19 @@ public interface IUserService extends UserDetailsService {
      * @return
      */
     MoResult<Boolean> modifyAccountStatusDisable(Long userId);
+    /**
+     * 注销账户新逻辑--冻结账户
+     * @param userId
+     * @return
+     */
+    JsonResult modifyAccountStatusDisableNew(Long userId);
+
     /**
      * 注销账户新逻辑
      * @param userId
      * @return
      */
-    MoResult<Boolean> modifyAccountStatusDisableNew(Long userId);
+    JsonResult deleteAccount(Long userId);
 
     /**
      * 激活账户
@@ -75,7 +82,7 @@ public interface IUserService extends UserDetailsService {
      * @param userId
      * @return
      */
-    MoResult<Boolean> modifyAccountStatusActiveNew(Long userId);
+    JsonResult modifyAccountStatusActiveNew(Long userId);
 
     /**
      * 修改用户姓名、身份证
@@ -86,12 +93,14 @@ public interface IUserService extends UserDetailsService {
      */
     MoResult<String> modifyUserDetail(Long userId, String realName, String idNO);
 
-    MoResult<String> modifyUserDetailNew(Long userId, String realName, String idNO);
+    JsonResult modifyUserDetailNew(Long userId, String realName, String idNO);
 
     MoResult<String> getRewardPointsType();
 
     JsonResult<UserBasicInfo> findUserInfoByUserParam(UserQueryParam userQueryParam);
 
+    JsonResult<UserBasicInfo> findUserInfoByUserParamNew(UserQueryParam userQueryParam);
+
     MoResult<String> queryPointDetailByPage(UserQueryParam  userQueryParam);
 
     MoResult<String> queryUserCouponInfoByUserParam(UserQueryParam userQueryParam);