Merge branch 'feature/1.9.26-爱马哥兼容2'

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

@@ -43,7 +43,8 @@ public class OrderManagerAdapter {
         if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
             return verifyResponse;
         }
-        return orderBeanFactory.getOrderManagerService(orderBean).orderConfirm(request, orderBean);
+        BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderConfirm(request, orderBean);
+        return handleResponse(request,orderBean,orderManagerResponse);
     }
 
     /**

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

@@ -61,13 +61,13 @@ public class DeliveryHandle {
     /**
      * 创建配送单
      *
-     * @param data
+     * @param orderBean
      * @param request
      * @return
      */
     public BaseResponse createDelivery(QueryOrdersResponse.DataBean.OrderBean orderBean, OrderManagerRequest request, StoreResponse storeInfo) {
         if (storeInfo == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), storeInfo.getStatusCode().toString()) || storeInfo.getBizVO() == null) {
-            throw new OrderServiceException(ResponseResult.STORE_INFO_NOT_FOUND);
+            return ResponseUtil.error(ResponseResult.STORE_INFO_NOT_FOUND);
         }
         if (!checkOrderOfDelivery(orderBean)) {
             return ResponseUtil.success();
@@ -91,7 +91,7 @@ public class DeliveryHandle {
     /**
      * 取消配送
      *
-     * @param orderBean
+     * @param data
      * @param request
      * @return
      */
@@ -106,7 +106,7 @@ public class DeliveryHandle {
             }
             //运单状态非待接单或系统接单时，不能取消运单
             if (ObjectUtils.equals(DeliveryStatus.RIDERSTARTDELIVERY.getCode(), deliverStatus)) {
-                throw new DeliveryServiceException(ResponseResult.DELIVERY_CANCEL_ORDER_ERROR, String.format("订单已%s，不能取消", DeliveryStatus.getDescByCode(data.getAddInfo().getDeliverStatus())));
+                return ResponseUtil.error(ResponseResult.DELIVERY_CANCEL_ORDER_ERROR);
             }
             CancelDeliveryOrderRequestDto cancelDeliveryOrderRequestDto = new CancelDeliveryOrderRequestDto();
             cancelDeliveryOrderRequestDto.setDeliveryId(data.getAddInfo().getDeliveryId());
@@ -115,7 +115,7 @@ public class DeliveryHandle {
             cancelDeliveryOrderRequestDto.setOrderCancelDescription("顾客取消订单");
             DeliveryResponseDto deliveryResponse = deliveryService.deliveryOrderCancel(cancelDeliveryOrderRequestDto, LogThreadLocal.getTrackingNo());
             if (deliveryResponse == null || !StringUtils.equals(ResponseResult.SUCCESS.getCode(), deliveryResponse.getCode()+"")) {
-                throw new DeliveryServiceException(ResponseResult.DELIVERY_CANCEL_ORDER_ERROR, deliveryResponse.getMsg());
+                return ResponseUtil.error(ResponseResult.DELIVERY_CANCEL_ORDER_ERROR);
             }
         }
         return ResponseUtil.success();

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

@@ -54,7 +54,7 @@ public class SaasOrderHandle {
             return ResponseUtil.success();
         }
         if (ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), confirmOrderResponse.getErrcode().toString())) {
-            throw new OrderServiceException(ResponseResult.ORDER_ACCEPT_FAILED);
+            return ResponseUtil.error(ResponseResult.ORDER_ACCEPT_FAILED);
         }
         return ResponseUtil.success();
     }
@@ -70,7 +70,7 @@ public class SaasOrderHandle {
         BaseQueryOrderRequest orderDoneRequest = orderSdkAdapter.getOrderConfirmRequest(request.getOperator(), orderBean);
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderDone(orderDoneRequest);
         if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
-            throw new OrderServiceException(ResponseResult.DONE_ORDER_FAIL);
+            return ResponseUtil.error(ResponseResult.DONE_ORDER_FAIL);
         }
         return ResponseUtil.success();
     }
@@ -86,7 +86,7 @@ public class SaasOrderHandle {
         BaseQueryOrderRequest orderDeliveryRequest = orderSdkAdapter.getOrderConfirmRequest(request.getOperator(), orderBean);
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderSend(orderDeliveryRequest);
         if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
-            throw new OrderServiceException(ResponseResult.DELIVERY_FAIL);
+            return ResponseUtil.error(ResponseResult.DELIVERY_FAIL);
         }
         return ResponseUtil.success();
     }
@@ -102,7 +102,7 @@ public class SaasOrderHandle {
         BaseQueryOrderRequest orderAffirmRequest = orderSdkAdapter.getOrderConfirmRequest(request.getOperator(), orderBean);
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderAffirm(orderAffirmRequest);
         if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
-            throw new OrderServiceException(ResponseResult.AFFIRM_ORDER_FAIL);
+            return ResponseUtil.error(ResponseResult.AFFIRM_ORDER_FAIL);
         }
         return ResponseUtil.success();
     }
@@ -119,7 +119,7 @@ public class SaasOrderHandle {
         CancelOrderRequest cancelOrderRequest = orderSdkAdapter.getCancelOrderRequest(request.getOperator(), request.getReason(), refundResponse.getPayRefundStatus(), refundResponse.getRefundId(), orderBean);
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderReject(cancelOrderRequest);
         if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
-            throw new OrderServiceException(ResponseResult.AFFIRM_ORDER_FAIL);
+            return ResponseUtil.error(ResponseResult.AFFIRM_ORDER_FAIL);
         }
         return ResponseUtil.success();
     }
@@ -141,7 +141,7 @@ public class SaasOrderHandle {
             baseOrderResponse = orderCenterSdkService.refundReturn(refundAgreeRequest);
         }
         if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
-            throw new OrderServiceException(ResponseResult.AGREE_REFUND_ORDER_FAIL);
+            return ResponseUtil.error(ResponseResult.AGREE_REFUND_ORDER_FAIL);
         }
         return ResponseUtil.success();
     }
@@ -156,7 +156,7 @@ public class SaasOrderHandle {
         CancelOrderRequest rejectRefundRequest = orderSdkAdapter.getRejectRefundRequest(request.getOperator(), request.getReason(), orderBean);
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderRefundReject(rejectRefundRequest);
         if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
-            throw new OrderServiceException(ResponseResult.REJECT_REFUND_ORDER_FAIL);
+            return ResponseUtil.error(ResponseResult.REJECT_REFUND_ORDER_FAIL);
         }
         return ResponseUtil.success();
 

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

@@ -7,6 +7,7 @@ import cn.freemud.management.entities.dto.response.pay.PayRefundResponse;
 import cn.freemud.management.enums.OperateType;
 import cn.freemud.management.enums.RefundStatus;
 import cn.freemud.management.enums.ResponseResult;
+import cn.freemud.management.intercept.OrderServiceException;
 import cn.freemud.management.service.OrderBaseService;
 import cn.freemud.management.service.OrderManagerService;
 import cn.freemud.management.service.handle.DeliveryHandle;
@@ -131,7 +132,12 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
     @Override
     public BaseResponse<OrderManagerResponse> orderReject(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
         //支付退款
-        PayRefundResponse refundResponse = paymentHandle.refund(request, orderBean);
+        PayRefundResponse refundResponse = new PayRefundResponse();
+        try {
+            refundResponse = paymentHandle.refund(request, orderBean);
+        } catch (OrderServiceException orderEx){ // 爱马哥兼容，不抛错
+            return ResponseUtil.error(orderEx.getResult());
+        }
         //订单拒单
         saasOrderHandle.orderReject(request, refundResponse, orderBean);
         // 推送pos、微信消息中心
@@ -154,7 +160,12 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         //取消配送单
         deliveryHandle.cancelDelivery(orderBean,request);
         //支付退款
-        PayRefundResponse refundResponse = paymentHandle.refund(request, orderBean);
+        PayRefundResponse refundResponse = new PayRefundResponse();
+        try {
+            refundResponse = paymentHandle.refund(request, orderBean);
+        } catch (OrderServiceException orderEx){ // 爱马哥兼容，不抛错
+            return ResponseUtil.error(orderEx.getResult());
+        }
         //订单同意退款
         saasOrderHandle.refundAgree(request, refundResponse, orderBean);
         // 推送pos、微信消息中心