Merge branch 'KA-支持门店手动创建运单，通知骑手到店取餐20210915-zxh' into qa

order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java

@@ -329,13 +329,10 @@ public class OrderManagerAdapter {
         }
         OrderBeanV1 orderBean = orderBeanResp.getResult();
         //订单接单参数校验
-        String companyId = orderBean.getCompanyId();
-        if (!macCafePartnerId.equals(companyId)) {
-            BaseResponse verifyResponse = orderVerifyHandle.orderConfirmTakeVerify(orderBean, request);
-            if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
-                return verifyResponse;
-            }
+        if (orderBean == null) {
+            return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
         }
+        String companyId = orderBean.getCompanyId();
         BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderCreateDelivery(request, orderBean);
         return handleResponse(request,orderBean,orderManagerResponse);
     }

order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java

@@ -95,7 +95,9 @@ public class PaymentHandle {
             if(ResponseResult.NOT_SUFFICIENT_FUNDS.getCode().equals(orderRefundResponse.getCode())){
                 throw new OrderServiceException(ResponseResult.NOT_SUFFICIENT_FUNDS);
             }
-            throw new OrderServiceException(ResponseResult.REFUND_FAIL,orderRefundResponse.getMessage());
+            ResponseResult refundFail = ResponseResult.REFUND_FAIL;
+            refundFail.setMessage(orderRefundResponse.getMessage());
+            throw new OrderServiceException(refundFail);
         }
         refundStatus=ObjectUtils.equals( PayRefundStatus.SUCCESS.getCode(), orderRefundResponse.getData().getRefundStatus())?PayRefundStatus.SUCCESS:PayRefundStatus.RUNNING;
         return handlePayRefundResponse(refundStatus,orderRefundRequest.getRefundId());