|
@@ -695,7 +695,11 @@ public class DeliverysServiceImpl extends BasicsService implements DeliverysServ
|
|
delivery.setStatusTime(null);
|
|
delivery.setStatusTime(null);
|
|
delivery.setWarehousingTime(0L);
|
|
delivery.setWarehousingTime(0L);
|
|
}
|
|
}
|
|
- delivery.setStatusName(ExpressStatusEnum.valueOf(delivery.getStatus()).getValue());
|
|
|
|
|
|
+ if(delivery.getStatus() == null){
|
|
|
|
+ delivery.setStatusName("不发送");
|
|
|
|
+ }else {
|
|
|
|
+ delivery.setStatusName(ExpressStatusEnum.valueOf(delivery.getStatus()).getValue());
|
|
|
|
+ }
|
|
delivery.setSmsStatusName(SmsSendStatusEnum.valueOf(delivery.getSmsStatus()).getValue());
|
|
delivery.setSmsStatusName(SmsSendStatusEnum.valueOf(delivery.getSmsStatus()).getValue());
|
|
if (StringUtils.isNotBlank(delivery.getSignPhotoUrl())){
|
|
if (StringUtils.isNotBlank(delivery.getSignPhotoUrl())){
|
|
delivery.setSignPhotoUrlList(Arrays.asList(delivery.getSignPhotoUrl().split(",")));
|
|
delivery.setSignPhotoUrlList(Arrays.asList(delivery.getSignPhotoUrl().split(",")));
|