Commit 5a6ff226 by 徐康

special name in candao

parent 0d70f767
...@@ -180,7 +180,7 @@ public class DeliveryAdapter { ...@@ -180,7 +180,7 @@ public class DeliveryAdapter {
ProductInfo deliveryProductInfo = new ProductInfo(); ProductInfo deliveryProductInfo = new ProductInfo();
deliveryProductInfo.setProductCode(productList.getProductId()); deliveryProductInfo.setProductCode(productList.getProductId());
String productName = productList.getProductName(); 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())) { if(CollectionUtils.isNotEmpty(extInfo.getSpecialAttrs())) {
String attr = ""; String attr = "";
for (OrderSpecialExtraAttrRequest special : extInfo.getSpecialAttrs()) { for (OrderSpecialExtraAttrRequest special : extInfo.getSpecialAttrs()) {
...@@ -210,7 +210,7 @@ public class DeliveryAdapter { ...@@ -210,7 +210,7 @@ public class DeliveryAdapter {
ProductInfo deliveryComboProductInfo = new ProductInfo(); ProductInfo deliveryComboProductInfo = new ProductInfo();
deliveryComboProductInfo.setProductCode(comboProduct.getProductId()); deliveryComboProductInfo.setProductCode(comboProduct.getProductId());
String productNameCombo = comboProduct.getProductName(); 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())) { if(CollectionUtils.isNotEmpty(extInfoCombo.getSpecialAttrs())) {
String attr = ""; String attr = "";
for (OrderSpecialExtraAttrRequest special : extInfoCombo.getSpecialAttrs()) { for (OrderSpecialExtraAttrRequest special : extInfoCombo.getSpecialAttrs()) {
......
...@@ -360,6 +360,8 @@ public class QueryOrdersResponseDto { ...@@ -360,6 +360,8 @@ public class QueryOrdersResponseDto {
*/ */
private String addInfo; private String addInfo;
private String extInfo;
/** /**
* 套餐--type:6 * 套餐--type:6
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment