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

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

@@ -186,7 +186,7 @@ public class DeliveryAdapter {
                 ProductInfo deliveryProductInfo = new ProductInfo();
                 deliveryProductInfo.setProductCode(productList.getProductId());
                 String productName = productList.getProductName();
-                OrderProductAddInfoDto extInfo = JSON.parseObject(productList.getAddInfo(), OrderProductAddInfoDto.class);
+                OrderProductAddInfoDto extInfo = JSON.parseObject(productList.getExtInfo(), OrderProductAddInfoDto.class);
                 if(CollectionUtils.isNotEmpty(extInfo.getSpecialAttrs())) {
                     String attr = "";
                     for (OrderSpecialExtraAttrRequest special : extInfo.getSpecialAttrs()) {
@@ -216,7 +216,7 @@ public class DeliveryAdapter {
                         ProductInfo deliveryComboProductInfo = new ProductInfo();
                         deliveryComboProductInfo.setProductCode(comboProduct.getProductId());
                         String productNameCombo = comboProduct.getProductName();
-                        OrderProductAddInfoDto extInfoCombo = JSON.parseObject(comboProduct.getAddInfo(), OrderProductAddInfoDto.class);
+                        OrderProductAddInfoDto extInfoCombo = JSON.parseObject(comboProduct.getExtInfo(), OrderProductAddInfoDto.class);
                         if(CollectionUtils.isNotEmpty(extInfoCombo.getSpecialAttrs())) {
                             String attr = "";
                             for (OrderSpecialExtraAttrRequest special : extInfoCombo.getSpecialAttrs()) {

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
                  */