From 249581e055b4207961e0e4fead3a1840a3c0c390 Mon Sep 17 00:00:00 2001
From: cheney <1251790704@qq.com>
Date: Fri, 26 Jan 2024 18:51:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=9D=A2=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/huoran/nakadai/controller/MyOrderController.java    | 4 +++-
 .../com/huoran/nakadai/listener/ConfirmOrderListener.java   | 4 +++-
 .../com/huoran/nakadai/service/impl/BasketServiceImpl.java  | 6 ++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/nakadai/src/main/java/com/huoran/nakadai/controller/MyOrderController.java b/nakadai/src/main/java/com/huoran/nakadai/controller/MyOrderController.java
index 8d71ece..6abee5a 100644
--- a/nakadai/src/main/java/com/huoran/nakadai/controller/MyOrderController.java
+++ b/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);
diff --git a/nakadai/src/main/java/com/huoran/nakadai/listener/ConfirmOrderListener.java b/nakadai/src/main/java/com/huoran/nakadai/listener/ConfirmOrderListener.java
index a8f6656..0613101 100644
--- a/nakadai/src/main/java/com/huoran/nakadai/listener/ConfirmOrderListener.java
+++ b/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) {
 //                // 每个产品的运费相加
diff --git a/nakadai/src/main/java/com/huoran/nakadai/service/impl/BasketServiceImpl.java b/nakadai/src/main/java/com/huoran/nakadai/service/impl/BasketServiceImpl.java
index 67faf7c..0b68fb8 100644
--- a/nakadai/src/main/java/com/huoran/nakadai/service/impl/BasketServiceImpl.java
+++ b/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()));
-                shopCartItemDto.setPrice(sku.getPrice());
+                if (sku.getPrice()!= null){
+                    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());