Commit 155d2d35 authored by 周健威's avatar 周健威

修改代碼

parent 7c2049f8
...@@ -28,7 +28,7 @@ public class RefundMQHandler { ...@@ -28,7 +28,7 @@ public class RefundMQHandler {
OrderRefundBiz orderRefundBiz; OrderRefundBiz orderRefundBiz;
/** /**
* 佣金 * 退款
* @param * @param
*/ */
@RabbitListener(queues = ORDER_DEPOSIT_REFUND_QUEUE) @RabbitListener(queues = ORDER_DEPOSIT_REFUND_QUEUE)
......
...@@ -55,6 +55,7 @@ import javax.annotation.Resource; ...@@ -55,6 +55,7 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -214,15 +215,14 @@ public class BaseOrderController extends CommonBaseController implements UserRes ...@@ -214,15 +215,14 @@ public class BaseOrderController extends CommonBaseController implements UserRes
if(userIds != null && userIds.size() >0) { if(userIds != null && userIds.size() >0) {
ObjectRestResponse<List<AppUserVo>> objectRestResponse = userFeign.getByUserIds(userIds); ObjectRestResponse<List<AppUserVo>> objectRestResponse = userFeign.getByUserIds(userIds);
log.info("获取用户信息:objectRestResponse = {}", objectRestResponse.getMessage()); 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) { for (OrderListVo orderPageVO : list) {
if (objectRestResponse.getData() != null && objectRestResponse.getData().size() > 0) { AppUserVo appUserVo = appUserVoMap.get(orderPageVO.getUserId().toString());
for (AppUserVo appUserVo : objectRestResponse.getData()) { if (null != appUserVo) {
if (appUserVo != null) { orderPageVO.setTelephone(appUserVo.getUsername());
orderPageVO.setTelephone(appUserVo.getUsername()); orderPageVO.setUsername(appUserVo.getNickname());
orderPageVO.setUsername(appUserVo.getNickname());
}
}
} }
if (orderPageVO.getOrderRentVehicleDetail() != null && orderPageVO.getOrderRentVehicleDetail().getVehicleId() != null) { if (orderPageVO.getOrderRentVehicleDetail() != null && orderPageVO.getOrderRentVehicleDetail().getVehicleId() != null) {
RestResponse<Vehicle> restResponse = vehicleFeign.findById(orderPageVO.getOrderRentVehicleDetail().getVehicleId()); RestResponse<Vehicle> restResponse = vehicleFeign.findById(orderPageVO.getOrderRentVehicleDetail().getVehicleId());
......
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