|
|
@@ -2502,7 +2502,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public String addSMOrder(SMOrderPo orderPo) {
|
|
|
Order order = new Order();
|
|
|
- order.setShopId(orderPo.getShopId());
|
|
|
+ order.setShopId(orderPo.getShopId() == null ? 0L : orderPo.getShopId());
|
|
|
order.setChannelId(0L);
|
|
|
order.setUserId("");
|
|
|
order.setOrderNumber(orderPo.getOrderNumber());
|
|
|
@@ -2524,6 +2524,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
order.setConsigneeName(orderPo.getConsigneeName());
|
|
|
order.setConsigneeMobile(orderPo.getConsigneeMobile());
|
|
|
order.setConsigneeAddress(orderPo.getConsigneeAddress());
|
|
|
+ order.setLatitude(orderPo.getLatitude());
|
|
|
+ order.setLongitude(orderPo.getLongitude());
|
|
|
order.setOffsetPoints(orderPo.getOffsetPoints());
|
|
|
List<SMOrderItemPo> orderItems = orderPo.getOrderItems();
|
|
|
List<String> list = orderItems.stream().map(SMOrderItemPo::getSkuName).collect(Collectors.toList());
|