围餐订单预览返回商品英文名

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

@@ -2061,28 +2061,37 @@ public class OrderAdapter {
         productVo.setId(productBean.getId());
         productVo.setPid(StringUtils.isBlank(productBean.getSpecification()) ? productBean.getProductId() : productBean.getSpecification());
         String productName = StringUtils.isBlank(productBean.getSpecificationName()) ? productBean.getProductName() : productBean.getSpecificationName();
+        String foreignProductName = StringUtils.isBlank(productBean.getSpecificationForeignName()) ? productBean.getProductForeignName() : productBean.getSpecificationForeignName();
         OrderProductAddInfoDto extInfo = JSON.parseObject(productBean.getExtInfo(), OrderProductAddInfoDto.class);
         if(CollectionUtils.isNotEmpty(extInfo.getSpecialAttrs())) {
             String attr = "";
+            String attrEng = "";
             for (OrderSpecialExtraAttrRequest special : extInfo.getSpecialAttrs()) {
                 if(special.getAttributeName().indexOf("冰") >= 0) {
                     attr = special.getAttributeName();
+                    attrEng = special.getAttributeForeignName();
                     break;
                 }
             }
             if(attr.length() > 0) {
                 productName += "("+attr+")";
             }
+            //英文名处理
+            if(attrEng.length() > 0) {
+                foreignProductName += "("+attrEng+")";
+            }
         }
-
         if(CollectionUtils.isNotEmpty(productBean.getMaterialProduct())) {
             for (QueryOrdersResponse.DataBean.OrderBean.ProductBean material : productBean.getMaterialProduct()) {
                 productName += "/"+material.getSpecificationName();
+                foreignProductName += "/"+material.getSpecificationForeignName();
             }
         }
 
         productVo.setName(productName);
         productVo.setSpuName(productBean.getProductName());
+        productVo.setForeignName(foreignProductName);
+        productVo.setSpuForeignName(productBean.getProductForeignName());
         productVo.setPicture(productBean.getPicture());
         productVo.setSequence(productBean.getSequence());
         productVo.setQty(productBean.getNumber());