|
@@ -364,7 +364,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
|
|
order.setAttachment(deliveryReqVO.getAttachment());
|
|
order.setAttachment(deliveryReqVO.getAttachment());
|
|
order.setDeliveryRemark(deliveryReqVO.getDeliveryRemark());
|
|
order.setDeliveryRemark(deliveryReqVO.getDeliveryRemark());
|
|
// 1.2 校验 deliveryType 是否为快递,是快递才可以发货
|
|
// 1.2 校验 deliveryType 是否为快递,是快递才可以发货
|
|
- if (ObjectUtil.notEqual(order.getDeliveryType(), DeliveryTypeEnum.EXPRESS.getType()) || ObjectUtil.notEqual(order.getDeliveryType(), DeliveryTypeEnum.VIRTUAL_PRODUCT.getType())) {
|
|
|
|
|
|
+ if (ObjectUtil.notEqual(order.getDeliveryType(), DeliveryTypeEnum.EXPRESS.getType()) && ObjectUtil.notEqual(order.getDeliveryType(), DeliveryTypeEnum.VIRTUAL_PRODUCT.getType())) {
|
|
throw exception(ORDER_DELIVERY_FAIL_DELIVERY_TYPE_NOT_EXPRESS);
|
|
throw exception(ORDER_DELIVERY_FAIL_DELIVERY_TYPE_NOT_EXPRESS);
|
|
}
|
|
}
|
|
|
|
|