xuq1

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

@@ -186,16 +186,6 @@ public class WorkerWarrantyLogic {
             if (!StringUtil.isEmpty((String)row.get(5)))
              workerWarranty.setOutTime(DateUtil.parse((String)row.get(5), "yyyy-MM-dd"));
 
-            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);
-            }
 
 
 
@@ -224,6 +214,18 @@ public class WorkerWarrantyLogic {
                 workerWarranty.setWarrantyId(IdWorker.getIdStr());
 
 
+            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);
+            }
+
+
 
             if (row.size() > 11) {
                 List<WorkerWarrantyPay> workerWarrantyPays1 = this.importPayAmount(row, workerWarranty.getWarrantyId(), rowIndex);