Commit 99a76563 authored by jiaorz's avatar jiaorz

新增交还车订单接口

parent add0c68c
...@@ -6,6 +6,7 @@ import cn.hutool.json.JSONUtil; ...@@ -6,6 +6,7 @@ import cn.hutool.json.JSONUtil;
import com.github.wxiaoqi.security.admin.entity.AppUserDetail; import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
import com.github.wxiaoqi.security.admin.feign.UserFeign; import com.github.wxiaoqi.security.admin.feign.UserFeign;
import com.github.wxiaoqi.security.admin.feign.dto.UserDTO; import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
import com.github.wxiaoqi.security.admin.vo.AppUserVo;
import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken; import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken; import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
import com.github.wxiaoqi.security.common.context.BaseContextHandler; import com.github.wxiaoqi.security.common.context.BaseContextHandler;
...@@ -106,12 +107,12 @@ public class BaseOrderController extends CommonBaseController { ...@@ -106,12 +107,12 @@ public class BaseOrderController extends CommonBaseController {
PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.listOrder(query.getSuper())); PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.listOrder(query.getSuper()));
List<OrderPageVO> list = pageDataVO.getData(); List<OrderPageVO> list = pageDataVO.getData();
List<Integer> userIds = list.stream().map(OrderPageVO::getUserId).distinct().collect(Collectors.toList()); List<Integer> userIds = list.stream().map(OrderPageVO::getUserId).distinct().collect(Collectors.toList());
ObjectRestResponse<List<AppUserDetail>> objectRestResponse = userFeign.getByUserIds(userIds); ObjectRestResponse<List<AppUserVo>> objectRestResponse = userFeign.getByUserIds(userIds);
for (OrderPageVO orderPageVO : list) { for (OrderPageVO orderPageVO : list) {
if (objectRestResponse.getData() != null && objectRestResponse.getData().size() > 0) { if (objectRestResponse.getData() != null && objectRestResponse.getData().size() > 0) {
for (AppUserDetail appUserDetail : objectRestResponse.getData()) { for (AppUserVo appUserVo : objectRestResponse.getData()) {
if (appUserDetail != null && appUserDetail.getUserid() == orderPageVO.getUserId()) { if (appUserVo != null && appUserVo.getUserid() == orderPageVO.getUserId()) {
orderPageVO.setUsername(appUserDetail.getNickname()); orderPageVO.setUsername(appUserVo.getNickname());
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment