From 08c0700ee6e906953f9c00d2010587ce5c8479a2 Mon Sep 17 00:00:00 2001
From: taozi <9108791@qq.com>
Date: Wed, 24 Feb 2021 15:15:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E4=B8=8B=E5=8D=95=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/YxStoreOrderServiceImpl.java | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
index b24a114c..ac7f24be 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
@@ -473,7 +473,8 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
 
             cartIds.add(cart.getId().toString());
             totalNum += cart.getCartNum();
-            if(cart.getProductInfo().getIsIntegral()==1){
+            if(cart.getProductInfo().getIsIntegral() != null
+                    && cart.getProductInfo().getIsIntegral()==1){
                 integral = NumberUtil.add(integral,
                         NumberUtil.mul(cart.getCartNum(),cart.getProductInfo().getAttrInfo().getIntegral()));
             }
@@ -1106,40 +1107,48 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
         wrapper.orderByDesc(YxStoreOrder::getId);
 
         switch (OrderStatusEnum.toType(type)){
-            case STATUS_0://未支付
+            //未支付
+            case STATUS_0:
                 wrapper.eq(YxStoreOrder::getPaid,OrderInfoEnum.PAY_STATUS_0.getValue())
                         .eq(YxStoreOrder::getRefundStatus,OrderInfoEnum.REFUND_STATUS_0.getValue())
                         .eq(YxStoreOrder::getStatus,OrderInfoEnum.STATUS_0.getValue());
                 break;
-            case STATUS_1://待发货
+            //待发货
+            case STATUS_1:
                 wrapper.eq(YxStoreOrder::getPaid,OrderInfoEnum.PAY_STATUS_1.getValue())
                         .eq(YxStoreOrder::getRefundStatus,OrderInfoEnum.REFUND_STATUS_0.getValue())
                         .eq(YxStoreOrder::getStatus,OrderInfoEnum.STATUS_0.getValue());
                 break;
-            case STATUS_2://待收货
+            //待收货
+            case STATUS_2:
                 wrapper.eq(YxStoreOrder::getPaid,OrderInfoEnum.PAY_STATUS_1.getValue())
                         .eq(YxStoreOrder::getRefundStatus,OrderInfoEnum.REFUND_STATUS_0.getValue())
                         .eq(YxStoreOrder::getStatus,OrderInfoEnum.STATUS_1.getValue());
                 break;
-            case STATUS_3://待评价
+            //待评价
+            case STATUS_3:
                 wrapper.eq(YxStoreOrder::getPaid,OrderInfoEnum.PAY_STATUS_1.getValue())
                         .eq(YxStoreOrder::getRefundStatus,OrderInfoEnum.REFUND_STATUS_0.getValue())
                         .eq(YxStoreOrder::getStatus,OrderInfoEnum.STATUS_2.getValue());
                 break;
-            case STATUS_4://已完成
+            //已完成
+            case STATUS_4:
                 wrapper.eq(YxStoreOrder::getPaid,OrderInfoEnum.PAY_STATUS_1.getValue())
                         .eq(YxStoreOrder::getRefundStatus,OrderInfoEnum.REFUND_STATUS_0.getValue())
                         .eq(YxStoreOrder::getStatus,OrderInfoEnum.STATUS_3.getValue());
                 break;
-            case STATUS_MINUS_1://退款中
+            //退款中
+            case STATUS_MINUS_1:
                 wrapper.eq(YxStoreOrder::getPaid,OrderInfoEnum.PAY_STATUS_1.getValue())
                         .eq(YxStoreOrder::getRefundStatus,OrderInfoEnum.REFUND_STATUS_1.getValue());
                 break;
-            case STATUS_MINUS_2://已退款
+            //已退款
+            case STATUS_MINUS_2:
                 wrapper.eq(YxStoreOrder::getPaid,OrderInfoEnum.PAY_STATUS_0.getValue())
                         .eq(YxStoreOrder::getRefundStatus,OrderInfoEnum.REFUND_STATUS_2.getValue());
                 break;
-            case STATUS_MINUS_3://退款
+            //退款
+            case STATUS_MINUS_3:
                 String[] strs = {"1","2"};
                 wrapper.eq(YxStoreOrder::getPaid,OrderInfoEnum.PAY_STATUS_1.getValue())
                         .in(YxStoreOrder::getRefundStatus, Arrays.asList(strs));
@@ -1930,7 +1939,8 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
         if(storeFreePostage.compareTo(BigDecimal.ZERO) != 0 && totalPrice.compareTo(storeFreePostage) <= 0){
             storePostage =  this.handlePostage(cartInfo,userAddress);
         }
-        if(cartInfo.size()==1&&cartInfo.get(0).getProductInfo().getIsIntegral()==1){
+        if(cartInfo.size()==1 && cartInfo.get(0).getProductInfo().getIsIntegral() != null
+                && cartInfo.get(0).getProductInfo().getIsIntegral()==1){
             totalPrice=BigDecimal.ZERO;
         }