Merge branch 'feature/xukang_20210907_麦咖啡订单数据推送到麦当劳' into qa

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

@@ -2531,7 +2531,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
 
     public BaseResponse mcCafePushOrder(McCafeQueryOrderVo queryOrderVo) {
 
-//        executor.submit(() -> {
+        executor.submit(() -> {
             for(int i=1;;i++) {
                 OrderConditionsReq orderConditionsReq = new OrderConditionsReq();
                 orderConditionsReq.setPartnerId(mcCafePartnerId);
@@ -2555,10 +2555,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                             orderInfoReqs.setReceiveTime(new Date().getTime()+"");
                         }
                         McCafePushOrderDto mcCafePushOrderDto = convert2McCafePushOrderInfo(orderInfoReqs);
-                        System.out.println(JSON.toJSONString(mcCafePushOrderDto));
-                        if(null != mcCafePushOrderDto) {
-                            return ResponseUtil.success(mcCafePushOrderDto);
-                        }
+                        AppLogUtil.infoLog("订单推送入参: "+JSON.toJSONString(mcCafePushOrderDto),null,null);
                         McCafePushOrderResponseDto responseDto = mcCafePushOrderClient.mcCafePushOrder(mcCafePushOrderDto);
                         PushMccafeOrder pushMccafeOrder = new PushMccafeOrder();
                         pushMccafeOrder.setOrderCode(orderInfoReqs.getOrderCode());
@@ -2598,7 +2595,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
 
                 }
             }
-//        });
+        });
 
         BaseResponse baseResponse = new BaseResponse();
         baseResponse.setCode("100");

order-application-service/src/main/java/cn/freemud/service/thirdparty/McCafePushOrderClient.java

@@ -3,17 +3,19 @@ package cn.freemud.service.thirdparty;
 import cn.freemud.annotations.LogIgnoreFeign;
 import cn.freemud.entities.dto.order.McCafePushOrderDto;
 import cn.freemud.entities.dto.McCafePushOrderResponseDto;
+import feign.Headers;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-@FeignClient(name = "MCD-PUSH-SERVICE", url = "http://")
+@FeignClient(name = "MCD-PUSH-SERVICE", url = "http://oms.uat.mcd.com.cn/order/migration")
 @RequestMapping(produces = {"application/json;charset=UTF-8"})
 public interface McCafePushOrderClient {
 
 
     @LogIgnoreFeign(logMessage="mcCafePushOrder")
-    @PostMapping("/mp/order")
+    @PostMapping(value="/mp/order",headers={"ContentType=application/json","Provider=WX"})
+    @Headers(value={"ContentType=application/json","Provider=WX"})
     McCafePushOrderResponseDto mcCafePushOrder(@RequestBody McCafePushOrderDto mcCafePushOrderDto);
 }