Merge branch 'feature-2020/8/6-McCafe-会阳' of…

Merge branch 'feature-2020/8/6-McCafe-会阳' of http://gitlab.freemud.com/order-group-application/order-group into feature-2020/8/6-McCafe-会阳

order-management/src/main/java/cn/freemud/management/enums/ResponseResult.java

@@ -167,6 +167,7 @@ public enum ResponseResult {
     REJECT_REFUND_ORDER_FAIL("45082", "拒绝退款失败"),
     ORDER_DELIVERY_CALL_BACK_FAILED("45083", "配送回调失败，为找到对应操作类型"),
     ORDER_UPDATE_PICKUP_FAILED("45084", "更新取餐码失败"),
+    ORDER_STATUS_FAILED("45085", "订单状态错误"),
     /**
      * 支付
      */

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

@@ -58,10 +58,12 @@ public class McCafeMangerServiceImpl implements OrderManagerService {
         }
         OrderManagerRequest orderManagerRequest =new OrderManagerRequest();
         BeanUtils.copyProperties(request,orderManagerRequest);
-        if (!OrderStatus.RECEIPT.getCode().equals(orderBean.getStatus())) {
-            return ResponseUtil.error(ResponseResult.DONE_FAIL_NOT_ACCEPT);
-            // 订单接单-->>修改为订单支付成功订单变成已接单
-            //saasOrderHandle.orderConfirm(orderManagerRequest, orderBean);
+        if (!OrderStatus.TAKE_ORDER.getCode().equals(orderBean.getStatus()) && !OrderStatus.RECEIPT.getCode().equals(orderBean.getStatus())){
+            return ResponseUtil.error(ResponseResult.ORDER_STATUS_FAILED);
+        }
+        if (OrderStatus.TAKE_ORDER.getCode().equals(orderBean.getStatus())) {
+            // 订单接单
+            saasOrderHandle.orderConfirm(orderManagerRequest, orderBean);
         }
         if (StringUtils.isNotEmpty(request.getPickUpGoodsNo())){
             //更新取餐码