update:购物车商品状态，正常时也返回

fengliang
1 parent b2f343c1
Showing 2 changed files with 3 additions and 2 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/domain/ProductDto.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/ShopCartImpl.java
@@ -50,8 +50,8 @@ public class ProductDto {
     private BigDecimal productPiecePrice;
  
     /** 订单商品交易类型（1、按重方式，2、按件方式） */
-    @NotNull(message = "商品交易类型不能为空")
-    private Integer productTradeType;
+
+    private Integer productTradeType = 1;
  
     /** 优惠券分担优惠金额 */
     private BigDecimal couponAmount;
@@ -133,6 +133,7 @@ public class ShopCartImpl implements IShopCartService {
                         shopCartMessageVo.setPieceWeight(0L);
                         shopCartMessageVo.setProductState(ShopCartMessageProductState.TYPE_CHANGE.getCodeInteger());
                     }else{
+                        shopCartMessageVo.setProductState(ShopCartMessageProductState.NORMAL.getCodeInteger());
                         //商品包装单位
                         shopCartMessageVo.setSaleUnit(productPresetVo.getSaleUnit());
                         //预设价格分