Commit f2d4ac07 by ping.wu

订单商品ext字段对象调整

parent 48c2f39d
...@@ -1659,9 +1659,9 @@ public class OrderAdapter { ...@@ -1659,9 +1659,9 @@ public class OrderAdapter {
productVo.setSpecification(attributeNames); productVo.setSpecification(attributeNames);
} }
if(StringUtils.isNotBlank(productBean.getExtInfo())){ if(StringUtils.isNotBlank(productBean.getExtInfo())){
OrderProductAddInfo orderProductAddInfo = gson.fromJson(productBean.getExtInfo(), OrderProductAddInfo.class); OrderProductAddInfoDto orderProductAddInfoDto = gson.fromJson(productBean.getExtInfo(), OrderProductAddInfoDto.class);
if(CollectionUtils.isNotEmpty(orderProductAddInfo.getProductBindingCoupons())){ if(CollectionUtils.isNotEmpty(orderProductAddInfoDto.getProductBindingCoupons())){
for (ProductBindingCouponType productBindingCouponType : orderProductAddInfo.getProductBindingCoupons()){ for (ProductBindingCouponType productBindingCouponType : orderProductAddInfoDto.getProductBindingCoupons()){
InventedParentActivityVo inventedParentActivityVo = new InventedParentActivityVo(); InventedParentActivityVo inventedParentActivityVo = new InventedParentActivityVo();
// inventedParentActivityVo.setActivityCode(productBindingCouponType.getActivityCode()); // inventedParentActivityVo.setActivityCode(productBindingCouponType.getActivityCode());
inventedParentActivityVo.setActivityName(productBindingCouponType.getActivityName()); inventedParentActivityVo.setActivityName(productBindingCouponType.getActivityName());
......
...@@ -337,8 +337,8 @@ public class SellCouponOrderServiceImpl { ...@@ -337,8 +337,8 @@ public class SellCouponOrderServiceImpl {
if(productBindingCouponType.getActivityCode().equals(activeDetailVO.getActiveCode())){ if(productBindingCouponType.getActivityCode().equals(activeDetailVO.getActiveCode())){
ProductBindingCouponType productBindingCouponType2 = new ProductBindingCouponType(); ProductBindingCouponType productBindingCouponType2 = new ProductBindingCouponType();
productBindingCouponType2.setActivityCode(productBindingCouponType.getActivityCode()); productBindingCouponType2.setActivityCode(productBindingCouponType.getActivityCode());
productBindingCouponType2.setActivityName(activeDetailVO.getActiveName());
productBindingCouponType2.setNum(productBindingCouponType.getNum()); productBindingCouponType2.setNum(productBindingCouponType.getNum());
productBindingCouponType2.setActivityName(activeDetailVO.getActiveName());
productBindingCoupons.add(productBindingCouponType2); productBindingCoupons.add(productBindingCouponType2);
break; break;
} }
......
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