Commit 3c05f55e by zhiheng.zhang

开放平台取消订单

parent be5d75fe
...@@ -280,11 +280,12 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService { ...@@ -280,11 +280,12 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
// 同意退款在支付退款后的退款/退货完成操作 // 同意退款在支付退款后的退款/退货完成操作
baseResponse = this.orderAgreeRefund(request, orderBean); baseResponse = this.orderAgreeRefund(request, orderBean);
} }
if(null == baseResponse){ if(null == baseResponse || !ObjectUtils.equals(SUCCESS,Integer.valueOf(baseResponse.getCode()))){
emailAlertService.sendEmailAlert("商家取消订单失败", "请求json:" + JSONObject.toJSONString(orderBean) + "返回msg:" + baseResponse.getMessage());
return ResponseUtil.error(ResponseResult.PARTNER_ORDER_CANCEL_ERROR); return ResponseUtil.error(ResponseResult.PARTNER_ORDER_CANCEL_ERROR);
} }
if(!ObjectUtils.equals(SUCCESS,Integer.valueOf(baseResponse.getCode()))){ baseResponse = executeCancel(request,orderBean, RefundStatus.COMPLETE_REFUND.getCode(), AfterSalesType.USER_SALE_RETURN.getIndex(), Integer.valueOf(orderBean.getOrderClient()));
emailAlertService.sendEmailAlert("商家取消订单失败", "请求json:" + JSONObject.toJSONString(orderBean) + "返回msg:" + baseResponse.getMessage()); if(null == baseResponse || !ObjectUtils.equals(SUCCESS,Integer.valueOf(baseResponse.getCode()))){
return ResponseUtil.error(ResponseResult.PARTNER_ORDER_CANCEL_ERROR); return ResponseUtil.error(ResponseResult.PARTNER_ORDER_CANCEL_ERROR);
} }
return ResponseUtil.success(); return ResponseUtil.success();
......
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