|
|
@@ -890,8 +890,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
List<OrderItem> orderItems = orderItemMapper.getListByOrderNumber(c.getOrderNumber());
|
|
|
c.setOrderItems(orderItems);
|
|
|
c.setGoodsTotalCount(orderItems.stream().map(OrderItem::getProdCount).reduce(0, Integer::sum));
|
|
|
- c.setReceiver(c.getConsigneeName());
|
|
|
- c.setUserMobile(c.getConsigneeMobile());
|
|
|
+ if (c.getReceiver() == null){
|
|
|
+ c.setReceiver(c.getConsigneeName());
|
|
|
+ }
|
|
|
+ if (c.getUserMobile() == null){
|
|
|
+ c.setUserMobile(c.getConsigneeMobile());
|
|
|
+ }
|
|
|
});
|
|
|
}
|
|
|
return page;
|