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

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

@@ -185,7 +185,7 @@ public class DeliveryAdapter {
             order.getProductList().forEach(productList -> {
                 ProductInfo deliveryProductInfo = new ProductInfo();
                 deliveryProductInfo.setProductCode(productList.getProductId());
-                String productName = productList.getProductName();
+                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 = "";
@@ -215,7 +215,7 @@ public class DeliveryAdapter {
                     productList.getComboProduct().forEach(comboProduct -> {
                         ProductInfo deliveryComboProductInfo = new ProductInfo();
                         deliveryComboProductInfo.setProductCode(comboProduct.getProductId());
-                        String productNameCombo = 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 = "";