Merge remote-tracking branch 'remotes/origin/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

@@ -270,21 +270,25 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
     private BaseResponse<OrderManagerResponse> executeRefund(OrderManagerRequest request,QueryOrdersResponse.DataBean.OrderBean orderBean, String operationType) {
         //订单接单参数校验
         BaseResponse verifyResponse = orderVerifyHandle.orderCancel(orderBean, request, OperateType.ORDER_AGREE_REFUND.getOpType());
+        log.info("executeRefund operationType :" + operationType);
         log.info("executeRefund verifyResponse :" + JsonUtil.toJSONString(verifyResponse));
         if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
             return ResponseUtil.error(verifyResponse.getCode());
         }
-        BaseResponse<OrderManagerResponse> baseResponse = new BaseResponse<OrderManagerResponse>();
+        BaseResponse<OrderManagerResponse> baseResponse = null;
         //调用oms拒绝订单
-        if (Objects.equals(operationType,OperateType.ORDER_REJECT_REFUND.getOpType())) {
+        if (operationType.equalsIgnoreCase(OperateType.ORDER_REJECT_REFUND.getOpType())) {
             baseResponse = this.orderReject(request, orderBean);
         }
         //调用oms同意退款
-        if (Objects.equals(operationType , OperateType.ORDER_AGREE_REFUND.getOpType())) {
+        if (operationType.equalsIgnoreCase(OperateType.ORDER_AGREE_REFUND.getOpType())) {
             // 同意退款在支付退款后的退款/退货完成操作
             baseResponse = this.orderAgreeRefund(request, orderBean);
         }
         log.info("executeRefund executeRefund baseResponse :" + JsonUtil.toJSONString(baseResponse));
+        if(null == baseResponse){
+            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());
             return ResponseUtil.error(ResponseResult.PARTNER_ORDER_CANCEL_ERROR);