|
|
@@ -149,8 +149,10 @@ public class MonthQRCodeTaskServiceImpl implements IMonthQRCodeTaskService {
|
|
|
bizWaybillOrder.setGoodsQty(orderInfo.getCargoes().get(0).getQuantity().longValue());
|
|
|
bizWaybillOrder.setOrderStatus(6);
|
|
|
bizWaybillOrder.setPickupType(orderInfo.getShipmentInfo().getPickupType());
|
|
|
- bizWaybillOrder.setSendStartTime(new Date(orderInfo.getShipmentInfo().getPickupStartTime()));
|
|
|
- bizWaybillOrder.setSendEndTime(new Date(orderInfo.getShipmentInfo().getPickupEndTime()));
|
|
|
+ if (orderInfo.getShipmentInfo() != null) {
|
|
|
+ bizWaybillOrder.setSendStartTime(new Date(orderInfo.getShipmentInfo().getPickupStartTime()));
|
|
|
+ bizWaybillOrder.setSendEndTime(new Date(orderInfo.getShipmentInfo().getPickupEndTime()));
|
|
|
+ }
|
|
|
// bizWaybillOrder.setPickupTime(new Date(orderInfo.getShipmentInfo().geta()));
|
|
|
// bizWaybillOrder.setDeliveryTime(waybillQRVerifyInfo.getDeliveryTime());
|
|
|
// bizWaybillOrder.setSignTime(waybillQRVerifyInfo.getSignTime());
|