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

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

@@ -2616,7 +2616,8 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         mcCafePushOrderDto.setSourceType(orderInfoReqs.getOrderClient().equals(OrderClientType.ALIPAY.getIndex())?"ALIMP":"WXMP");
         mcCafePushOrderDto.setBeType("3");
         mcCafePushOrderDto.setDayPart("2");
-        mcCafePushOrderDto.setChannel("10");
+        mcCafePushOrderDto.setChannel(orderInfoReqs.getOrderClient().equals(OrderClientType.ALIPAY.getIndex())?"43":"10");
+
         mcCafePushOrderDto.setStatus(NewOrderStatus.COMPLETE.getIndex().equals(orderInfoReqs.getOrderState())?"40":"80");
         mcCafePushOrderDto.setInvoiceNeeded(orderExtInfoDto.getNeedInvoice());
         mcCafePushOrderDto.setInvoiced(1);
@@ -2778,7 +2779,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         McCafePushOrderDto.OrderPayment orderPayment = new McCafePushOrderDto.OrderPayment();
         orderPayment.setChannelPayTransactionId(orderExtInfoDto.getPayTransId());
         orderPayment.setPayStatus("PAID");
-        orderPayment.setPaySource("10");
+        orderPayment.setPaySource(orderInfoReqs.getOrderClient().equals(OrderClientType.ALIPAY.getIndex())?"43":"10");
         orderPayment.setPayChannel(orderInfoReqs.getOrderClient().equals(OrderClientType.ALIPAY.getIndex())?"ALI":"WX");
         orderPayment.setPayAmount(orderInfoReqs.getActualPayAmount().intValue());
         if(NewOrderStatus.CLOSED.getIndex().equals(orderInfoReqs.getOrderState()) && CollectionUtils.isNotEmpty(orderInfoReqs.getAfterSalesOrderList())) {
@@ -2855,7 +2856,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
             orderDelivery.setCompletedTime(DateUtil.convert2String(new Date(Long.valueOf(orderInfoReqs.getReceiveTime())), "yyyy-MM-dd HH:mm:ss"));
             orderDelivery.setCreatedDate(DateUtil.convert2String(new Date(Long.valueOf(orderInfoReqs.getCreateTime())), "yyyy-MM-dd HH:mm:ss"));
 
-            orderAddress.setChannel(orderInfoReqs.getOrderClient().equals(OrderClientType.ALIPAY.getIndex())?"54":"45");
+            orderAddress.setChannel(orderInfoReqs.getOrderClient().equals(OrderClientType.ALIPAY.getIndex())?"43":"10");
             orderAddress.setCustomerId(orderExtInfoDto.getThirdPartyMemberId());
             orderAddress.setCustomerNickName(orderInfoReqs.getUserName());