Commit 958340f3dd2145f4738130eed5c2fd6a474e5f52
1 parent
b2f343c1
update:购物车商品状态，正常时也返回
Showing
2 changed files
with
3 additions
and
2 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/domain/ProductDto.java
| @@ -50,8 +50,8 @@ public class ProductDto { | @@ -50,8 +50,8 @@ public class ProductDto { | ||
| 50 | private BigDecimal productPiecePrice; | 50 | private BigDecimal productPiecePrice; |
| 51 | 51 | ||
| 52 | /** 订单商品交易类型（1、按重方式，2、按件方式） */ | 52 | /** 订单商品交易类型（1、按重方式，2、按件方式） */ |
| 53 | - @NotNull(message = "商品交易类型不能为空") | ||
| 54 | - private Integer productTradeType; | 53 | + |
| 54 | + private Integer productTradeType = 1; | ||
| 55 | 55 | ||
| 56 | /** 优惠券分担优惠金额 */ | 56 | /** 优惠券分担优惠金额 */ |
| 57 | private BigDecimal couponAmount; | 57 | private BigDecimal couponAmount; |
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/ShopCartImpl.java
| @@ -133,6 +133,7 @@ public class ShopCartImpl implements IShopCartService { | @@ -133,6 +133,7 @@ public class ShopCartImpl implements IShopCartService { | ||
| 133 | shopCartMessageVo.setPieceWeight(0L); | 133 | shopCartMessageVo.setPieceWeight(0L); |
| 134 | shopCartMessageVo.setProductState(ShopCartMessageProductState.TYPE_CHANGE.getCodeInteger()); | 134 | shopCartMessageVo.setProductState(ShopCartMessageProductState.TYPE_CHANGE.getCodeInteger()); |
| 135 | }else{ | 135 | }else{ |
| 136 | + shopCartMessageVo.setProductState(ShopCartMessageProductState.NORMAL.getCodeInteger()); | ||
| 136 | //商品包装单位 | 137 | //商品包装单位 |
| 137 | shopCartMessageVo.setSaleUnit(productPresetVo.getSaleUnit()); | 138 | shopCartMessageVo.setSaleUnit(productPresetVo.getSaleUnit()); |
| 138 | //预设价格分 | 139 | //预设价格分 |