‘linchangsheng’ 6 ماه پیش
والد
کامیت
7d97caf4ee
1فایلهای تغییر یافته به همراه1 افزوده شده و 1 حذف شده
  1. 1 1
      mall-server-api/src/main/java/com/gree/mall/manager/logic/worker/WorkerWarrantyLogic.java

+ 1 - 1
mall-server-api/src/main/java/com/gree/mall/manager/logic/worker/WorkerWarrantyLogic.java

@@ -233,7 +233,7 @@ public class WorkerWarrantyLogic {
                 }
             }
 
-            if (CollectionUtils.isNotEmpty(workerWarrantyListUp))
+            if (CollectionUtils.isNotEmpty(workerWarrantyListUp) && workerWarranty.getRefundAmount() != null)
                 workerWarranty.setRefundAmount(workerWarrantyListUp.get(0).getRefundAmount().add(workerWarranty.getRefundAmount()));
 
             workerWarranties.add(workerWarranty);