Merge branch 'feature/20230118_服务端自动接单标识_wuping' of…

Merge branch 'feature/20230118_服务端自动接单标识_wuping' of https://gitlab.freemud.com/order-group-application/order-group into develop

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

@@ -106,8 +106,7 @@ public class OrderVerifyHandle {
         if (checkRefund(orderBean)
                 && orderBean.getHasRefund() != null
                 && orderBean.getHasRefund()
-                && (orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getStatus() == 1
-                || orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getStatus() == 4)) {
+                && orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getStatus() == 1) {
             return ResponseUtil.error(ResponseResult.DELIVERY_SEND_APPLY_REFUND, getOrderManagerResponse(orderBean));
         }
         //外卖订单不是接单不能送出
@@ -144,8 +143,7 @@ public class OrderVerifyHandle {
         //判断订单状态是否为已经申请退款订单
         if (orderBean.getHasRefund() != null
                 && orderBean.getHasRefund()
-                && (orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getStatus() == 1
-                || orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getStatus() == 4)) {
+                && orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getStatus() == 1) {
             return ResponseUtil.error(ResponseResult.DONE_FAIL_APPLY_REFUND, getOrderManagerResponse(orderBean));
         }
         if (this.checkSaasWm(orderBean) && this.verifyThirdFlow(orderBean,request)) {
@@ -176,8 +174,7 @@ public class OrderVerifyHandle {
         //判断订单状态是否为已经申请退款订单
         if (checkRefund(orderBean)&&orderBean.getHasRefund() != null
                 && orderBean.getHasRefund()
-                && (orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getStatus() == 1
-                || orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getStatus() == 4)) {
+                && orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getStatus() == 1) {
             return ResponseUtil.error(ResponseResult.AFFIRM_FAIL_APPLY_REFUND, getOrderManagerResponse(orderBean));
         }
         //校验订单是否为配送状态

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

@@ -101,7 +101,7 @@ public class SaasOrderHandle {
         requestDto.setAcceptMode(orderConfirmRequest.getAcceptMode());
         // 引入门店基础服务 查询自动制作完成配置时间
         if (Objects.nonNull(orderConfirmRequest.getPreTimeout())) {
-            request.setTimeout(orderConfirmRequest.getPreTimeout());
+            requestDto.setTimeout(orderConfirmRequest.getPreTimeout());
         } else {
             requestDto = storeHandle.setTimeout(orderConfirmRequest, requestDto);
         }