订单面议

nakadai/src/main/java/com/huoran/nakadai/controller/MyOrderController.java

@@ -121,7 +121,9 @@ public class MyOrderController {
         double total = 0.0;
         Integer totalNum = 0;
         for (OrderItemDto orderItem : orderShopDto.getOrderItemDtos()) {
-            total = Arith.add(total, orderItem.getProductTotalAmount());
+            if (orderItem.getProductTotalAmount()!=null){
+                total = Arith.add(total, orderItem.getProductTotalAmount());
+            }
             totalNum += orderItem.getProdCount();
         }
         orderShopDto.setTotal(total);

nakadai/src/main/java/com/huoran/nakadai/listener/ConfirmOrderListener.java

@@ -82,7 +82,9 @@ public class ConfirmOrderListener {
             }
 
             totalCount = shopCartItem.getProdCount() + totalCount;
-            total = Arith.add(shopCartItem.getProductTotalAmount(), total);
+            if (shopCartItem.getProductTotalAmount()!=null){
+                total = Arith.add(shopCartItem.getProductTotalAmount(), total);
+            }
             // 用户地址如果为空，则表示该用户从未设置过任何地址相关信息
 //            if (userAddr != null) {
 //                // 每个产品的运费相加

nakadai/src/main/java/com/huoran/nakadai/service/impl/BasketServiceImpl.java

@@ -189,8 +189,10 @@ public class BasketServiceImpl extends ServiceImpl<BasketMapper, Basket> impleme
                 shopCartItemDto.setSkuName(sku.getSkuName());
                 shopCartItemDto.setPic(StrUtil.isBlank(sku.getPic())? prod.getPic() : sku.getPic());
                 shopCartItemDto.setProdName(sku.getProdName());
-                shopCartItemDto.setProductTotalAmount(Arith.mul(sku.getPrice(),orderItem.getProdCount()));
+                if (sku.getPrice()!= null){
-                shopCartItemDto.setPrice(sku.getPrice());
+                    shopCartItemDto.setProductTotalAmount(Arith.mul(sku.getPrice(),orderItem.getProdCount()));
+                    shopCartItemDto.setPrice(sku.getPrice());
+                }
 //            shopCartItemDto.setDistributionCardNo(orderItem.getDistributionCardNo());
                 shopCartItemDto.setBasketDate(new Date());
                 ShopDetail shopDetail = shopDetailService.getShopDetailByShopId(orderItem.getShopId());