Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mqhandler/RefundMQHandler.java

@@ -28,7 +28,7 @@ public class RefundMQHandler {
     OrderRefundBiz orderRefundBiz;
 
     /**
-     * 佣金
+     * 退款
      * @param
      */
     @RabbitListener(queues = ORDER_DEPOSIT_REFUND_QUEUE)

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -55,6 +55,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -214,16 +215,15 @@ public class BaseOrderController extends CommonBaseController implements UserRes
        if(userIds != null && userIds.size() >0) {
            ObjectRestResponse<List<AppUserVo>> objectRestResponse = userFeign.getByUserIds(userIds);
            log.info("获取用户信息：objectRestResponse = {}", objectRestResponse.getMessage());
+           Map<String, AppUserVo> appUserVoMap = objectRestResponse.getData() == null? new HashMap<String, AppUserVo>()
+                   : objectRestResponse.getData().parallelStream().collect(Collectors.toMap(v -> v.getUserid().toString(), v -> v));
 
            for (OrderListVo orderPageVO : list) {
-               if (objectRestResponse.getData() != null && objectRestResponse.getData().size() > 0) {
-                   for (AppUserVo appUserVo : objectRestResponse.getData()) {
-                       if (appUserVo != null) {
+               AppUserVo appUserVo = appUserVoMap.get(orderPageVO.getUserId().toString());
+               if (null != appUserVo) {
                    orderPageVO.setTelephone(appUserVo.getUsername());
                    orderPageVO.setUsername(appUserVo.getNickname());
                }
-                   }
-               }
                if (orderPageVO.getOrderRentVehicleDetail() != null && orderPageVO.getOrderRentVehicleDetail().getVehicleId() != null) {
                    RestResponse<Vehicle> restResponse = vehicleFeign.findById(orderPageVO.getOrderRentVehicleDetail().getVehicleId());
                    log.info("获取车辆信息返回消息：{}", restResponse.getMessage());