Merge branch 'zyj-三方外卖出餐更新pick-uptime'

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

@@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
 import java.util.Objects;
 
 @Component
@@ -40,6 +41,8 @@ public class OrderManagerAdapter {
     private OrderBeanFactory orderBeanFactory;
     @Value("${mccafe.partner.id}")
     private String macCafePartnerId;
+    @Value("#{'${o2o.orderClient}'.split(',')}")
+    private List<String> o2oOrderClients;
 
 
     /**
@@ -87,7 +90,7 @@ public class OrderManagerAdapter {
         BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderDone(request, orderBean);
 
         //更新外卖订单的pickUpTime
-        if (ObjectUtils.equals(ResponseResult.SUCCESS.getCode(), orderManagerResponse.getCode())) {
+        if (ObjectUtils.equals(ResponseResult.SUCCESS.getCode(), orderManagerResponse.getCode()) && o2oOrderClients.contains(orderBean.getOrderClient())) {
             String trackingNo = LogThreadLocal.getTrackingNo();
             TakeOutOrderPickUpTimeReq takeOutOrderPickUpTimeReq = new TakeOutOrderPickUpTimeReq();
             takeOutOrderPickUpTimeReq.setOrderCode(request.getOrderId());