Merge remote-tracking branch 'origin/feature-2020/8/6-McCafe-会阳' into feature-2020/8/6-McCafe-会阳

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

@@ -16,6 +16,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -27,6 +28,8 @@ public class OrderManagerAdapter {
     private OrderBaseService orderBaseService;
     @Autowired
     private OrderBeanFactory orderBeanFactory;
+    @Value("${mcCafe.partnerId}")
+    private String macCafePartnerId;
 
 
     /**
@@ -39,9 +42,12 @@ public class OrderManagerAdapter {
         //查询订单
         QueryOrdersResponse.DataBean.OrderBean orderBean = orderBaseService.getByOrderCode(request.getOrderId());
         //订单接单参数校验
-        BaseResponse verifyResponse = orderVerifyHandle.orderConfirmTakeVerify(orderBean, request);
-        if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
-            return verifyResponse;
+        String companyId = orderBean.getCompanyId();
+        if (!macCafePartnerId.equals(companyId)) {
+            BaseResponse verifyResponse = orderVerifyHandle.orderConfirmTakeVerify(orderBean, request);
+            if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
+                return verifyResponse;
+            }
         }
         BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderConfirm(request, orderBean);
         return handleResponse(request,orderBean,orderManagerResponse);

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

@@ -6,6 +6,7 @@ import cn.freemud.management.entities.dto.request.delivery.DeliveryOrderAssembly
 import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
 import cn.freemud.management.entities.dto.response.order.OrderManagerResponse;
 import cn.freemud.management.entities.dto.response.pay.PayRefundResponse;
+import cn.freemud.management.enums.OrderStatus;
 import cn.freemud.management.enums.ResponseResult;
 import cn.freemud.management.service.OrderManagerService;
 import cn.freemud.management.service.handle.*;
@@ -52,12 +53,16 @@ public class McCafeMangerServiceImpl implements OrderManagerService {
 
     @Override
     public BaseResponse<OrderManagerResponse> orderConfirm(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
+        if (orderBean == null) {
+            return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
+        }
         OrderManagerRequest orderManagerRequest =new OrderManagerRequest();
         BeanUtils.copyProperties(request,orderManagerRequest);
-        // 订单接单
-        saasOrderHandle.orderConfirm(orderManagerRequest, orderBean);
-
-        //支付成功已经 创建配送单
+        if (!OrderStatus.RECEIPT.getCode().equals(orderBean.getStatus())) {
+            return ResponseUtil.error(ResponseResult.DONE_FAIL_NOT_ACCEPT);
+            // 订单接单-->>修改为订单支付成功订单变成已接单
+            //saasOrderHandle.orderConfirm(orderManagerRequest, orderBean);
+        }
         if (StringUtils.isNotEmpty(request.getPickUpGoodsNo())){
             //更新取餐码
             BaseResponse baseResponse = saasOrderHandle.updatePickUpGoodNo(request, orderBean);