客服系统合规

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

@@ -263,8 +263,8 @@ public class UserRest {
      */
     @PostMapping(value = "/search/userInfo")
     public JsonResult getBasicUserInfo(UserQueryParam userQueryParam) {
-        JsonResult result = userService.findUserInfoByUserParam(userQueryParam);
-        //JsonResult result = userService.findUserInfoByUserParamNew(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/impl/UserServiceImpl.java

@@ -787,8 +787,8 @@ public class UserServiceImpl implements IUserService {
             throw new BusinessException(ErrorCodeEnum.NET_ERROR);
         }
     }
-    //新逻辑
-    @Override
+    //新逻辑,直接调用kdsp，方便维护
+/*    @Override
     public JsonResult modifyAccountStatusDisableNew(Long userId) {
         try {
             //调用天津自牧finance-gateway接口,将电商userid,转换为金融userid
@@ -826,10 +826,10 @@ public class UserServiceImpl implements IUserService {
             log.error("[user][modifyAccountStatusDisableNew] 网络通讯异常,userId:{},ex:{}", userId, ExceptionUtils.getStackTrace(e));
             throw new BusinessException(ErrorCodeEnum.NET_ERROR);
         }
-    }
+    }*/
 
     //新逻辑
-/*    @Override
+    @Override
     public JsonResult modifyAccountStatusDisableNew(Long userId) {
         try {
             //调用kdsp接口校验是否有在途数据（订单在途+金融在途）
@@ -845,14 +845,13 @@ public class UserServiceImpl implements IUserService {
                 JSONObject jsonObject = JSONObject.parseObject(result);;
                 String businessCode = jsonObject.getString("businessCode");
                 //返回信息
-                JSONObject userJsonObject = null;
                 if("0000".equals(businessCode)){
                     //调用用户中心，将账户状态更新为冻结
                     Map param1 = Maps.newHashMap();
                     param1.put("userId", userId.toString());
                     String userUrl = userSysUrl + "/innerapi/user/disable";
                     String userResult = httpService.post(userUrl, header, param1);
-                    userJsonObject = JSONObject.parseObject(userResult);
+                    JSONObject userJsonObject = JSONObject.parseObject(userResult);
                     String userBusinessCode = userJsonObject.getString("businessCode");
                     if("0000".equals(userBusinessCode)){
                         return JsonResult.buildSuccessResult(userJsonObject.getString("msg"),userJsonObject.get("data"));
@@ -869,7 +868,7 @@ public class UserServiceImpl implements IUserService {
             log.error("[user][modifyAccountStatusDisableNew] 网络通讯异常,userId:{},ex:{}", userId, ExceptionUtils.getStackTrace(e));
             throw new BusinessException(ErrorCodeEnum.NET_ERROR);
         }
-    }*/
+    }
 
     /**
      * 真正的注销账户，删除账户信息