迁移谛听功能

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

@@ -17,6 +17,7 @@ import cn.quantgroup.customer.rest.vo.JsonResult;
 import cn.quantgroup.customer.rest.vo.MoResult;
 import cn.quantgroup.customer.service.IUserService;
 import cn.quantgroup.customer.service.IXyqbService;
+import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +29,7 @@ import javax.validation.Valid;
 import java.security.Principal;
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Map;
 
 import static cn.quantgroup.customer.constant.Constant.GSON;
 
@@ -211,15 +213,23 @@ public class UserRest {
     }
 
     /**
-     * 查询用户绑卡信息
+     * 查询用户和绑卡信息
      *
-     * @param userId
+     * @param userQueryParam
      * @return
      */
     @PostMapping(value = "/card_list")
-    public JsonResult findUserCardList(@RequestParam(required = true) Long userId) {
+    public JsonResult findUserCardList(UserQueryParam userQueryParam) {
+        Map<String, Object> result = Maps.newHashMap();
+        JsonResult<UserBasicInfo> userInfo = userService.findUserInfo(userQueryParam);
+        if (userInfo != null && userInfo.isSuccess() && userInfo.getData() != null) {
+            UserBasicInfo userBasicInfo = userInfo.getData();
+            result.put("userInfo", userBasicInfo)
+            Long userId = userBasicInfo.getUserId();
             List<UserCardInfo> userPayCardList = xyqbService.findUserPayCardList(userId);
-        return JsonResult.buildSuccessResult("success", userPayCardList);
+            result.put("cardInfo", userPayCardList);
+        }
+        return JsonResult.buildSuccessResult("success", result);
     }