|
|
@@ -617,7 +617,7 @@ public class BizWaybillOrderServiceImpl implements IBizWaybillOrderService
|
|
|
if (!"是".equals(dto.getIsReceiptCollect()) && !"否".equals(dto.getIsReceiptCollect())) {
|
|
|
errorMsg.append("签单返还参数有误;");
|
|
|
}
|
|
|
- if (dto.getGuaranteeMoney().compareTo(new BigDecimal("0")) <= 0) {
|
|
|
+ if (null != dto.getGuaranteeMoney()&& dto.getGuaranteeMoney().compareTo(new BigDecimal("0")) <= 0) {
|
|
|
errorMsg.append("保价金额不能小于等于0;");
|
|
|
}
|
|
|
dto.setAddedService(getAddedService(dto));
|
|
|
@@ -969,8 +969,8 @@ public class BizWaybillOrderServiceImpl implements IBizWaybillOrderService
|
|
|
// 转Date给你原有字段用
|
|
|
Date startTime = Date.from(nextHour.atZone(ZoneId.systemDefault()).toInstant());
|
|
|
Date endTime = Date.from(endHour.atZone(ZoneId.systemDefault()).toInstant());
|
|
|
- bizWaybillOrder.setSendStartTime(startTime);
|
|
|
- bizWaybillOrder.setSendEndTime(endTime);
|
|
|
+// bizWaybillOrder.setSendStartTime(startTime);
|
|
|
+// bizWaybillOrder.setSendEndTime(endTime);
|
|
|
// bizWaybillOrder.setSendStartTime(DateUtils.parseDate(dto.getSendStartTime()));
|
|
|
// bizWaybillOrder.setSendEndTime(DateUtils.parseDate(dto.getSendEndTime()));
|
|
|
|