需求

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

@@ -93,6 +93,7 @@ public class WorkerWarrantyLogic {
         }
 
         workerWarranty.setRefundAmount(workerWarranty.getRefundAmount().add(workerWarrantyRefund.getRefundAmount()));
+        workerWarranty.setRefundTime(new Date());
         workerWarranty.updateById();
         workerWarrantyRefund.insert();
     }
@@ -229,7 +230,7 @@ public class WorkerWarrantyLogic {
                 if (CollectionUtils.isNotEmpty(workerWarrantyListUp))
                     workerWarranty.setPayableAmount(workerWarrantyListUp.get(0).getPayableAmount());
                 for (WorkerWarrantyPay workerWarrantyPay : workerWarrantyPays1) {
-                    workerWarranty.setPayableAmount(workerWarrantyPay.getPayAmount().add(workerWarranty.getPayableAmount()));
+                    workerWarranty.setPayableAmount(workerWarrantyPay.getPayAmount().add((workerWarranty.getPayableAmount() == null?BigDecimal.ZERO:workerWarranty.getPayableAmount())));
                 }
             }