Merge branch 'feature/20210610-开放平台取消订单接口移动-张志恒' into qa

# Conflicts:
#	order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java

order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java

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