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

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

@@ -2553,7 +2553,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                 orderConditionsReq.setPartnerId(mcCafePartnerId);
                 orderConditionsReq.setOrderStatuses(Arrays.asList(6,7));
                 orderConditionsReq.setPayStatuses(Arrays.asList(2,3,5));
-                orderConditionsReq.setOrderTypes(Arrays.asList(1,3,5));
+                orderConditionsReq.setOrderTypes(Arrays.asList(1,2,3,4,5,6));
                 orderConditionsReq.setStartTimestamp(DateUtil.convert2Date(queryOrderVo.getStartDate(), "yyyy-MM-dd HH:mm:ss").getTime()/1000);
                 orderConditionsReq.setEndTimestamp(DateUtil.convert2Date(queryOrderVo.getEndDate(), "yyyy-MM-dd HH:mm:ss").getTime()/1000);
                 orderConditionsReq.setPageNum(i);
@@ -2646,9 +2646,9 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         McCafePushOrderDto mcCafePushOrderDto = new McCafePushOrderDto();
         mcCafePushOrderDto.setMpOrderId(orderInfoReqs.getOrderCode());
         mcCafePushOrderDto.setDisplayOrderId(orderInfoReqs.getDownstreamThirdOrderCode());
-        mcCafePushOrderDto.setType(orderInfoReqs.getOrderType()==3?"2":"1");
-        mcCafePushOrderDto.setSaleType("1");
-        mcCafePushOrderDto.setEatType(orderInfoReqs.getOrderType()==3?"2":"1");
+        mcCafePushOrderDto.setType(orderInfoReqs.getOrderType()==3||orderInfoReqs.getOrderType()==4?"2":"1");
+        mcCafePushOrderDto.setSaleType(orderInfoReqs.getOrderType()==1||orderInfoReqs.getOrderType()==3||orderInfoReqs.getOrderType()==5?"1":"2");
+        mcCafePushOrderDto.setEatType(orderInfoReqs.getOrderType()==3||orderInfoReqs.getOrderType()==4?"2":"1");
         mcCafePushOrderDto.setDeliveryType("1");
         mcCafePushOrderDto.setSourceType(orderInfoReqs.getOrderClient().equals(OrderClientType.ALIPAY.getIndex())?"ALIMP":"WXMP");
         mcCafePushOrderDto.setBeType("3");