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

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

@@ -215,7 +215,21 @@ public class DeliveryAdapter {
                     productList.getComboProduct().forEach(comboProduct -> {
                         ProductInfo deliveryComboProductInfo = new ProductInfo();
                         deliveryComboProductInfo.setProductCode(comboProduct.getProductId());
-                        deliveryComboProductInfo.setProductName(comboProduct.getProductName());
+                        String productNameCombo = comboProduct.getProductName();
+                        OrderProductAddInfoDto extInfoCombo = JSON.parseObject(comboProduct.getAddInfo(), OrderProductAddInfoDto.class);
+                        if(CollectionUtils.isNotEmpty(extInfoCombo.getSpecialAttrs())) {
+                            String attr = "";
+                            for (OrderSpecialExtraAttrRequest special : extInfoCombo.getSpecialAttrs()) {
+                                if(special.getAttributeName().indexOf("冰") >= 0) {
+                                    attr += special.getAttributeName()+",";
+                                }
+                            }
+                            if(attr.length() > 0) {
+                                attr = attr.substring(0, attr.length()-1);
+                                productNameCombo += "("+attr+")";
+                            }
+                        }
+                        deliveryComboProductInfo.setProductName(productNameCombo);
                         deliveryComboProductInfo.setProductNumber(comboProduct.getNumber()/productList.getNumber());
                         deliveryComboProductInfo.setProductPrice(comboProduct.getSalePrice().intValue());
                         //餐道使用