‘linchangsheng’ vor 5 Monaten
Ursprung
Commit
3ecfb583ee

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

@@ -189,6 +189,12 @@ public class WorkerWarrantyLogic {
             if (!StringUtil.isEmpty((String)row.get(3))) {
                 workerWarranty.setRefundAmount(Convert.toBigDecimal(row.get(3)));
                 workerWarranty.setRefundTime(DateUtil.parse((String) row.get(2), "yyyy-MM-dd"));
+
+                WorkerWarrantyRefund workerWarrantyRefund = new WorkerWarrantyRefund();
+                workerWarrantyRefund.setWarrantyId(workerWarranty.getWarrantyId());
+                workerWarrantyRefund.setRefundAmount(workerWarranty.getRefundAmount());
+                workerWarrantyRefund.setRefundTime(workerWarranty.getRefundTime());
+                workerWarrantyRefunds.add(workerWarrantyRefund);
             }
 
 
@@ -217,11 +223,7 @@ public class WorkerWarrantyLogic {
             else
                 workerWarranty.setWarrantyId(IdWorker.getIdStr());
 
-            WorkerWarrantyRefund workerWarrantyRefund = new WorkerWarrantyRefund();
-            workerWarrantyRefund.setWarrantyId(workerWarranty.getWarrantyId());
-            workerWarrantyRefund.setRefundAmount(workerWarranty.getRefundAmount());
-            workerWarrantyRefund.setRefundTime(workerWarranty.getRefundTime());
-            workerWarrantyRefunds.add(workerWarrantyRefund);
+
 
             if (row.size() > 11) {
                 List<WorkerWarrantyPay> workerWarrantyPays1 = this.importPayAmount(row, workerWarranty.getWarrantyId(), rowIndex);