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

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())) {
-            return ResponseUtil.error(ResponseResult.ORDER_ACCEPT_FAILED);
+            throw new OrderServiceException(ResponseResult.ORDER_ACCEPT_FAILED);
         }
         return ResponseUtil.success();
     }

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

@@ -6,6 +6,7 @@ import cn.freemud.management.adapter.WaimaiSdkAdapter;
 import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
 import cn.freemud.management.entities.dto.response.order.OrderManagerResponse;
 import cn.freemud.management.enums.ResponseResult;
+import cn.freemud.management.intercept.OrderServiceException;
 import cn.freemud.management.service.OrderManagerService;
 import cn.freemud.management.util.ResponseUtil;
 import com.freemud.application.sdk.api.takeaway.request.order.AgreeOrderRequest;
@@ -49,7 +50,7 @@ public class WaimaiOrderMangerServiceImpl implements OrderManagerService {
         PlatformOrderRequest platformOrderRequest = waimaiSdkAdapter.getPlatformOrderRequest(request, orderBean);
         com.freemud.application.sdk.api.base.BaseResponse waimaiBaseResponse = waimaiOrderService.confirm(platformOrderRequest, LogTreadLocal.getTrackingNo());
         if (ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), waimaiBaseResponse.getCode())) {
-            return ResponseUtil.error(ResponseResult.ORDER_ACCEPT_FAILED);
+            throw new OrderServiceException(ResponseResult.ORDER_ACCEPT_FAILED);
         }
         return ResponseUtil.success();
     }