Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -2060,6 +2060,11 @@ public class OrderAdapter {
         productVo.setSequence(productBean.getSequence());
         productVo.setQty(productBean.getNumber());
         productVo.setSpecification("");
+        productVo.setUserId(productBean.getUserId());
+        productVo.setOpenId(productBean.getOpenId());
+        productVo.setNickName(productBean.getNickName());
+        productVo.setPhotoUrl(productBean.getPhotoUrl());
+        productVo.setPackPrice(productBean.getPackPrice());
         List<InventedParentActivityVo> inventedParentActivityVos = new ArrayList<>();
         String attributeNames = "";
         if (StringUtils.isNotBlank(productBean.getAddInfo()) && productBean.getAddInfo().contains("attributeNames")) {

order-application-service/src/main/java/cn/freemud/entities/vo/QueryCollageOrderResponseVo.java

@@ -261,6 +261,11 @@ public class QueryCollageOrderResponseVo {
      */
     private Boolean enableRefund;
 
+    /**
+     * 订单特殊类型 1:普通订单 2:拼团订单 3:秒杀订单 4:拼单订单
+     */
+    private Byte marketingType;
+
 
     //private List<ProductVo> products;