Merge remote-tracking branch 'origin/qa' into qa

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

@@ -280,10 +280,6 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
             // 同意退款在支付退款后的退款/退货完成操作
             baseResponse = this.orderAgreeRefund(request, orderBean);
         }
-        if (Objects.equals(operationType , OperateType.ORDER_REJECT_REFUND.getOpType())) {
-            // 取消订单
-            baseResponse = this.orderReject(request, orderBean);
-        }
         if(!ObjectUtils.equals(SUCCESS,Integer.valueOf(baseResponse.getCode()))){
             emailAlertService.sendEmailAlert("商家取消订单失败", "请求json:" + JSONObject.toJSONString(orderBean) + "返回msg:" + baseResponse.getMessage());
             return ResponseUtil.error(ResponseResult.PARTNER_ORDER_CANCEL_ERROR);