Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into qa

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

@@ -1922,15 +1922,21 @@ public class OrderAdapter {
             String attr = "";
             for (OrderSpecialExtraAttrRequest special : extInfo.getSpecialAttrs()) {
                 if(special.getAttributeName().indexOf("冰") >= 0) {
-                    attr += special.getAttributeName()+",";
+                    attr = special.getAttributeName();
+                    break;
                 }
             }
             if(attr.length() > 0) {
-                attr = attr.substring(0, attr.length()-1);
                 productName += "("+attr+")";
             }
         }
 
+        if(CollectionUtils.isNotEmpty(productBean.getMaterialProduct())) {
+            for (QueryOrdersResponse.DataBean.OrderBean.ProductBean material : productBean.getMaterialProduct()) {
+                productName += "/"+material.getSpecificationName();
+            }
+        }
+
         productVo.setName(productName);
         productVo.setSpuName(productBean.getProductName());
         productVo.setPicture(productBean.getPicture());