Commit 4b271164 by 徐康

Merge branch 'feature-2020/8/6-McCafe-会阳' into qa

parents 18621a56 47c7ca1d
...@@ -171,7 +171,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -171,7 +171,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
return orderManagerAdapter.orderAffirm(orderManagerRequest,null); return orderManagerAdapter.orderAffirm(orderManagerRequest,null);
} else if(deliveryStatus == DeliveryStatus.WATINGORDER.getCode() || deliveryStatus == DeliveryStatus.SYSTEMGETORDER.getCode() } else if(deliveryStatus == DeliveryStatus.WATINGORDER.getCode() || deliveryStatus == DeliveryStatus.SYSTEMGETORDER.getCode()
|| deliveryStatus == DeliveryStatus.ALLOTRIDER.getCode()|| deliveryStatus == DeliveryStatus.RIDERARRIVESTORE.getCode()) { || deliveryStatus == DeliveryStatus.ALLOTRIDER.getCode()|| deliveryStatus == DeliveryStatus.RIDERARRIVESTORE.getCode()) {
ResponseUtil.success(); return ResponseUtil.success();
} }
return ResponseUtil.error(ResponseResult.ORDER_DELIVERY_CALL_BACK_FAILED); return ResponseUtil.error(ResponseResult.ORDER_DELIVERY_CALL_BACK_FAILED);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment