Merge branch 'feature/20201022_麦咖啡对接蜂鸟_xukang' into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java

order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java

@@ -185,7 +185,19 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
             }
             return baseResponse;
         } else if(deliveryStatus == DeliveryStatus.WATINGORDER.getCode() || deliveryStatus == DeliveryStatus.SYSTEMGETORDER.getCode()
-                || deliveryStatus == DeliveryStatus.ALLOTRIDER.getCode()|| deliveryStatus == DeliveryStatus.RIDERARRIVESTORE.getCode()) {
+                || deliveryStatus == DeliveryStatus.RIDERARRIVESTORE.getCode()) {
+            updateDeliveryStatus(request);
+            return ResponseUtil.success();
+        } else if(deliveryStatus == DeliveryStatus.ALLOTRIDER.getCode()){
+            if("FengNiao".equalsIgnoreCase(request.getChannelCode())) {
+                OrderCollectReq orderCollectReq = new OrderCollectReq();
+                orderCollectReq.setOrderCode(request.getOrderId());
+                orderCollectReq.setPartnerId(request.getPartnerId());
+                com.freemud.application.sdk.api.ordercenter.response.BaseResponse baseResponse = orderSdkService.collectOrder(orderCollectReq, LogTreadLocal.getTrackingNo());
+                if(ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(baseResponse.getCode())) {
+                    ResponseUtil.error(ResponseResult.ORDER_COLLECT_FAILED);
+                }
+            }
             updateDeliveryStatus(request);
             return ResponseUtil.success();
         } else if(deliveryStatus == DeliveryStatus.COLLECTING.getCode()) {
@@ -209,6 +221,12 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
         updateDeliveryInfoByIdRequest.setOrderId(request.getOrderId());
         updateDeliveryInfoByIdRequest.setOrderSubState(request.getDeliveryStatus());
         updateDeliveryInfoByIdRequest.setOperator("sys");
+        if(StringUtils.isNotBlank(request.getRiderPhone())) {
+            updateDeliveryInfoByIdRequest.setCourierPhone(request.getRiderPhone());
+        }
+        if(StringUtils.isNotBlank(request.getRiderName())) {
+            updateDeliveryInfoByIdRequest.setCourierName(request.getRiderName());
+        }
         return orderCenterSdkService.updateDeliveryInfoById(updateDeliveryInfoByIdRequest);
     }
 

order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java

@@ -147,6 +147,8 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
     private String withOrderBuyCouponCode;
     @Value("${mcCafe.withOrderBuy.cardId}")
     private String withOrderBuyCardId;
+    @Value("${mcCafe.fengniao.storeId}")
+    private String fnStoreId;
 
     @Autowired
     private DeliveryFeiginClient deliveryFeiginClient;

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -175,6 +175,8 @@ public class OrderServiceImpl implements Orderservice {
     private String cloudPrintQueue;
     @Value("${mq.cloud_print_exchange}")
     private String cloud_print_exchange;
+    @Value("${mcCafe.fengniao.storeId}")
+    private String fnStoreId;
 
 
     @Autowired
@@ -3010,6 +3012,9 @@ public class OrderServiceImpl implements Orderservice {
         if (userLoginInfoDto == null || StringUtils.isBlank(userLoginInfoDto.getMemberId())) {
             return ResponseUtil.error(ResponseResult.NOT_LOGIN);
         }
+        if(fnStoreId.indexOf(userLoginInfoDto.getStoreId()) >= 0) {
+            return ResponseUtil.success();
+        }
         BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
         baseQueryOrderRequest.setOrderId(reminderVo.getOid());
         baseQueryOrderRequest.setTrackingNo(LogTreadLocal.getTrackingNo());