|
@@ -786,7 +786,9 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
|
|
|
db.setCreateTime(now).setPay(0).setNo(carBuseinssNo + RandomUtil.randomNumbers(4));
|
|
|
}
|
|
|
for (TbBusinessItem item : itemList) {
|
|
|
- checkOtherBusiness(item.getItemTypeId(), otherBusinessBO.getOperateTime(), tbBusiness.getId(), carNo);
|
|
|
+ if (StrUtil.isNotEmpty(otherBusinessBO.getOperateTime())) {
|
|
|
+ checkOtherBusiness(item.getItemTypeId(), otherBusinessBO.getOperateTime(), tbBusiness.getId(), carNo);
|
|
|
+ }
|
|
|
}
|
|
|
db.setPayType(TbBusinessCar.PayTypeEnum.NO_PAY_TYPE.getType());
|
|
|
if ((TbItem.ItemTypeEnum.EMPTY_TYPE.getType().equals(carType) && chinaCarPay == 0) || (TbItem.ItemTypeEnum.WEIGHT_TYPE.getType().equals(carType) && vietnamCarPay == 0)) {
|