|
@@ -532,7 +532,7 @@ public class FlashDeliveryApplicationService {
|
|
|
IPage<FlashDeliveryOrder> orders = orderMapper.selectPage(page(pageNum, pageSize), query);
|
|
IPage<FlashDeliveryOrder> orders = orderMapper.selectPage(page(pageNum, pageSize), query);
|
|
|
FlashDeliveryRiderOrderPageView result = new FlashDeliveryRiderOrderPageView();
|
|
FlashDeliveryRiderOrderPageView result = new FlashDeliveryRiderOrderPageView();
|
|
|
result.setRecords(orders.getRecords().stream()
|
|
result.setRecords(orders.getRecords().stream()
|
|
|
- .map(order -> riderOrderListView(order, effectiveLongitude, effectiveLatitude)).toList());
|
|
|
|
|
|
|
+ .map(order -> riderOrderListView(riderId, order, effectiveLongitude, effectiveLatitude)).toList());
|
|
|
result.setTotal(orders.getTotal());
|
|
result.setTotal(orders.getTotal());
|
|
|
result.setCurrent(orders.getCurrent());
|
|
result.setCurrent(orders.getCurrent());
|
|
|
result.setSize(orders.getSize());
|
|
result.setSize(orders.getSize());
|
|
@@ -1101,7 +1101,7 @@ public class FlashDeliveryApplicationService {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/** 订单实体转骑手端任务卡片,可附带骑手到取件点的直线距离。 */
|
|
/** 订单实体转骑手端任务卡片,可附带骑手到取件点的直线距离。 */
|
|
|
- private FlashDeliveryRiderOrderListView riderOrderListView(FlashDeliveryOrder order,
|
|
|
|
|
|
|
+ private FlashDeliveryRiderOrderListView riderOrderListView(Long riderId, FlashDeliveryOrder order,
|
|
|
BigDecimal longitude, BigDecimal latitude) {
|
|
BigDecimal longitude, BigDecimal latitude) {
|
|
|
FlashDeliveryRiderOrderListView view = new FlashDeliveryRiderOrderListView();
|
|
FlashDeliveryRiderOrderListView view = new FlashDeliveryRiderOrderListView();
|
|
|
view.setId(order.getId());
|
|
view.setId(order.getId());
|
|
@@ -1138,6 +1138,8 @@ public class FlashDeliveryApplicationService {
|
|
|
view.setAmount(order.getAmount());
|
|
view.setAmount(order.getAmount());
|
|
|
view.setCurrency(order.getCurrency());
|
|
view.setCurrency(order.getCurrency());
|
|
|
view.setCreateTime(order.getCreateTime());
|
|
view.setCreateTime(order.getCreateTime());
|
|
|
|
|
+ // 备注仅对中单骑手本人可见;newTask 待抢卡片保持脱敏为空。
|
|
|
|
|
+ view.setUserNote(Objects.equals(riderId, order.getRiderId()) ? order.getUserNote() : null);
|
|
|
return view;
|
|
return view;
|
|
|
}
|
|
}
|
|
|
|
|
|