需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/AgreementLogic.java

@@ -570,7 +570,7 @@ public class AgreementLogic {
 
         //今天要发送的保单
         Date endTime = DateUtil.parseDateTime(DateUtils.formatDate(date,"yyyy-MM-dd") +" "+ mailbox.getSendTime()+":00");
-        if(date.getTime() < endTime.getTime()){
+        if(date.before(endTime)){
             //还没到可发邮件的时间
             return;
         }
@@ -1104,8 +1104,8 @@ public class AgreementLogic {
         //今天要发送的保单
         //Date startTime = DateUtil.beginOfDay(new Date());
         Date endTime = DateUtil.parseDateTime(DateUtils.formatDate(date,"yyyy-MM-dd") +" "+ mailbox.getSendTime()+":00");
-        if(date.getTime() < endTime.getTime()){
-            //还没到可发邮件的时间
+         if(date.before(endTime)){
+           //还没到可发邮件的时间
             return;
         }
 
@@ -1295,7 +1295,7 @@ public class AgreementLogic {
         //今天要发送的保单
         //Date startTime = DateUtil.beginOfDay(new Date());
         Date endTime = DateUtil.parseDateTime(DateUtils.formatDate(date,"yyyy-MM-dd") +" "+ mailbox.getSendTime()+":00");
-        if(date.getTime() < endTime.getTime()){
+        if(date.before(endTime)){
             //还没到可发邮件的时间
             return;
         }

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

@@ -216,8 +216,17 @@ public class WorkerWarrantyLogic {
             if (row.size() > 11) {
                 List<WorkerWarrantyPay> workerWarrantyPays1 = this.importPayAmount(row, workerWarranty.getWarrantyId(), rowIndex);
                 workerWarrantyPays.addAll(workerWarrantyPays1);
+
+                if (CollectionUtils.isNotEmpty(workerWarrantyListUp))
+                    workerWarranty.setPayableAmount(workerWarrantyListUp.get(0).getPayableAmount().add(workerWarranty.getPayableAmount()));
+                for (WorkerWarrantyPay workerWarrantyPay : workerWarrantyPays1) {
+                    workerWarranty.setPayableAmount(workerWarrantyPay.getPayAmount().add(workerWarranty.getPayableAmount()));
+                }
             }
 
+            if (CollectionUtils.isNotEmpty(workerWarrantyListUp))
+                workerWarranty.setRefundAmount(workerWarrantyListUp.get(0).getRefundAmount().add(workerWarranty.getRefundAmount()));
+
             workerWarranties.add(workerWarranty);
 
         }