|
@@ -222,7 +222,7 @@ public class OpenApiOrderServiceImpl implements OpenApiOrderService {
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public ResponseResult cancelOrder(OrderCancelReq cancelReq) {
|
|
|
ResponseResult result = ResponseResult.success();
|
|
|
- if (StringUtils.isBlank(cancelReq.getOrderSn()) && StringUtils.isBlank(cancelReq.getOutOrderSn())) {
|
|
|
+ if (StringUtils.isBlank(cancelReq.getOrderSn()) || StringUtils.isBlank(cancelReq.getOutOrderSn())) {
|
|
|
return ResponseResult.error(ResponseResultCodeEnum.FIELD_EMPTY, "订单", null);
|
|
|
}
|
|
|
Order order = iOrderService.selectOrderBySn(cancelReq.getOrderSn(), cancelReq.getOutOrderSn());
|
|
@@ -428,7 +428,7 @@ public class OpenApiOrderServiceImpl implements OpenApiOrderService {
|
|
|
@Override
|
|
|
public ResponseResult riderLocation(OrderLocationReq locationReq) {
|
|
|
ResponseResult result = ResponseResult.success();
|
|
|
- if (StringUtils.isBlank(locationReq.getOrderSn()) && StringUtils.isBlank(locationReq.getOutOrderSn())) {
|
|
|
+ if (StringUtils.isBlank(locationReq.getOrderSn()) || StringUtils.isBlank(locationReq.getOutOrderSn())) {
|
|
|
return ResponseResult.error(ResponseResultCodeEnum.FIELD_EMPTY, "订单号", null);
|
|
|
}
|
|
|
Order order = iOrderService.selectOrderBySn(locationReq.getOrderSn(), locationReq.getOutOrderSn());
|