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

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

@@ -185,8 +185,8 @@ public class DeliveryAdapter {
             order.getProductList().forEach(productList -> {
                 ProductInfo deliveryProductInfo = new ProductInfo();
                 deliveryProductInfo.setProductCode(productList.getProductId());
-                String productName = productList.getProductName();
-                OrderProductAddInfoDto extInfo = JSON.parseObject(productList.getAddInfo(), OrderProductAddInfoDto.class);
+                String productName = StringUtils.isBlank(productList.getSpecificationName()) ? productList.getProductName() : productList.getSpecificationName();
+                OrderProductAddInfoDto extInfo = JSON.parseObject(productList.getExtInfo(), OrderProductAddInfoDto.class);
                 if(CollectionUtils.isNotEmpty(extInfo.getSpecialAttrs())) {
                     String attr = "";
                     for (OrderSpecialExtraAttrRequest special : extInfo.getSpecialAttrs()) {
@@ -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 = StringUtils.isBlank(comboProduct.getSpecificationName()) ? comboProduct.getProductName() : comboProduct.getSpecificationName();
+                        OrderProductAddInfoDto extInfoCombo = JSON.parseObject(comboProduct.getExtInfo(), 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());
                         //餐道使用

order-application-service/src/main/java/cn/freemud/entities/dto/QueryOrdersResponseDto.java

@@ -360,6 +360,8 @@ public class QueryOrdersResponseDto {
                  */
                 private String addInfo;
 
+                private String extInfo;
+
                 /**
                  * 套餐--type:6
                  */