|
@@ -223,8 +223,14 @@ public class OpenApiOrderServiceImpl implements OpenApiOrderService {
|
|
public ResponseResult cancelOrder(OrderCancelReq cancelReq) {
|
|
public ResponseResult cancelOrder(OrderCancelReq cancelReq) {
|
|
ResponseResult result = ResponseResult.success();
|
|
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);
|
|
|
|
|
|
+ return ResponseResult.error(ResponseResultCodeEnum.FIELD_EMPTY, "猎豹订单号", null);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ if (StringUtils.isBlank(cancelReq.getOutOrderSn())) {
|
|
|
|
+ return ResponseResult.error(ResponseResultCodeEnum.FIELD_EMPTY, "接入方订单编号", null);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
Order order = iOrderService.selectOrderBySn(cancelReq.getOrderSn(), cancelReq.getOutOrderSn());
|
|
Order order = iOrderService.selectOrderBySn(cancelReq.getOrderSn(), cancelReq.getOutOrderSn());
|
|
|
|
|
|
if (Objects.isNull(order)) {
|
|
if (Objects.isNull(order)) {
|
|
@@ -236,7 +242,7 @@ public class OpenApiOrderServiceImpl implements OpenApiOrderService {
|
|
return ResponseResult.error(ResponseResultCodeEnum.ORDER_HAS_BEEN_CANCEL);
|
|
return ResponseResult.error(ResponseResultCodeEnum.ORDER_HAS_BEEN_CANCEL);
|
|
}
|
|
}
|
|
|
|
|
|
- if (1 != cancelReq.getCancelType() && 4 !=cancelReq.getCancelType()) {
|
|
|
|
|
|
+ if (1 != cancelReq.getCancelType() && 4 != cancelReq.getCancelType()) {
|
|
return ResponseResult.error(ResponseResultCodeEnum.ORDER_CANCEL_TYPE_NOT_EXIST);
|
|
return ResponseResult.error(ResponseResultCodeEnum.ORDER_CANCEL_TYPE_NOT_EXIST);
|
|
}
|
|
}
|
|
|
|
|