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

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

@@ -2688,7 +2688,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                 orderItem.setMpParentItemId(orderItemResp.getParentProductId().split("_")[0]);
             }
             orderItem.setProductType(parse2McdProductType(orderItemResp.getProductType()));
-            orderItem.setProductCode(orderItemResp.getProductCode());
+            orderItem.setProductCode(StringUtils.isNotBlank(orderItemResp.getProductCode())?orderItemResp.getProductCode():orderItemResp.getThirdProductId());
             OrderProductAddInfoDto orderProductAddInfoDto = JSON.parseObject(orderItemResp.getExtInfo(), OrderProductAddInfoDto.class);
             orderItem.setProductAttribute(new ArrayList<>());
             if(CollectionUtils.isNotEmpty(orderProductAddInfoDto.getSpecialAttrs())) {