需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -229,7 +229,7 @@ public class PayOrderLogic {
 
 
             if (workerServiceProceAmount.doubleValue() > 0.01) {
-                workerProceAmount.add(workerServiceProceAmount.setScale(2, BigDecimal.ROUND_HALF_UP));
+                workerProceAmount.add(workerServiceProceAmount.setScale(2, BigDecimal.ROUND_CEILING));
 
             }else {
                 workerProceAmount.add(Convert.toBigDecimal("0.01"));
@@ -244,7 +244,7 @@ public class PayOrderLogic {
 
 
             if (workerOtherProceAmount.doubleValue() > 0.01) {
-                workerProceAmount.add(workerOtherProceAmount.setScale(2, BigDecimal.ROUND_HALF_UP));
+                workerProceAmount.add(workerOtherProceAmount.setScale(2, BigDecimal.ROUND_CEILING));
 
             }else {
                 workerProceAmount.add(Convert.toBigDecimal("0.01"));
@@ -267,7 +267,7 @@ public class PayOrderLogic {
 
 
         if (workerProceAmount.doubleValue() > 0.01) {
-            workerOrderBuy.setWorkerProceAmount(workerProceAmount.setScale(2, BigDecimal.ROUND_HALF_UP));
+            workerOrderBuy.setWorkerProceAmount(workerProceAmount.setScale(2, BigDecimal.ROUND_CEILING));
         }else {
             workerOrderBuy.setWorkerProceAmount(Convert.toBigDecimal("0.01"));
         }
@@ -327,7 +327,7 @@ public class PayOrderLogic {
 
 
         if (workerProceAmount.doubleValue() > 0.01) {
-            workerOrderItem.setWorkerProceAmount(workerProceAmount.setScale(2, BigDecimal.ROUND_HALF_UP));
+            workerOrderItem.setWorkerProceAmount(workerProceAmount.setScale(2, BigDecimal.ROUND_CEILING));
 
         }else {
             workerOrderItem.setWorkerProceAmount(Convert.toBigDecimal("0.01"));
@@ -407,7 +407,7 @@ public class PayOrderLogic {
 
 
         if (workerProceAmount.doubleValue() > 0.01) {
-            workerOrderItem.setWorkerProceAmount(workerProceAmount.setScale(2, BigDecimal.ROUND_HALF_UP));
+            workerOrderItem.setWorkerProceAmount(workerProceAmount.setScale(2, BigDecimal.ROUND_CEILING));
 
         }else {
             workerOrderItem.setWorkerProceAmount(Convert.toBigDecimal("0.01"));

mall-server-api/src/main/java/com/gree/mall/manager/controller/policy/MailboxController.java

@@ -120,7 +120,6 @@ public class MailboxController {
 
     @ApiOperation(value = "已发邮箱记录-重新发送")
     @PostMapping("resend")
-
     public ResponseHelper send(@ApiParam(value = "批次号", required = false)
                                    @RequestParam(required = false) String sendBatch) throws IOException {
         agreementLogic.sendEmail(sendBatch);

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

@@ -11,6 +11,7 @@ import com.gree.mall.manager.commonmapper.PolicyCMapper;
 import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.plus.entity.*;
 import com.gree.mall.manager.plus.service.*;
+import com.gree.mall.manager.utils.StringUtil;
 import com.gree.mall.manager.utils.email.EmailUtilsNew;
 import com.gree.mall.manager.utils.excel.ExcelUtils;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
@@ -240,7 +241,7 @@ public class AgreementLogic {
         }
 
 
-/*        if (mailboxSendRecord.getPolicyType().equals("IN")) {
+        if (mailboxSendRecord.getPolicyType().equals("IN")) {
 
             //发邮件
             try {
@@ -251,28 +252,86 @@ public class AgreementLogic {
                 mailboxSendRecord.setSendStatus("NO");
                 mailboxSendRecord.updateById();
             }
-        }*/
+        }
 
 
 
     }
 
+    private void sendEmailFileIn(List<MailboxSendRecordPolicy> mailboxSendRecordPolicies, MailboxSendRecord mailboxSendRecord, Mailbox mailbox) {
+        String[] titles = new String[]{"序号","网点编号","网点名称","服务人员编号","服务人员名称","联系电话","身份证号码","保单名称","缴费金额",
+                "生效日期","截止日期","所属一级网点编号","所属一级网点编号","代买单位"};
+        List<List<Object>> rows = new ArrayList<>();
+        for(int i = 0;i < mailboxSendRecordPolicies.size();i++) {
+            MailboxSendRecordPolicy record = mailboxSendRecordPolicies.get(i);
+            List<Object> row = new ArrayList<>();
+            row.add(i + 1);
+            row.add(record.getWebsitId());
+            row.add(record.getWebsitName());
+            if (StringUtil.isEmpty(record.getReplaceName()))
+                row.add("新增");
+            else
+                row.add("替换");
+            row.add(record.getPolicyName());
+            row.add("居民身份证");
+            row.add(record.getPolicyIdcard());
+            if (!StringUtil.isEmpty(record.getReplaceName())){
+                row.add(record.getReplaceName());
+                row.add("居民身份证");
+                row.add(record.getReplaceIdcard());
+            }
+            rows.add(row);
+        }
+        // 获取资源文件存放路径，用于临时存放生成的excel文件
+        String path = "/tmp";
+        if(active.equals("dev")) {
+            path = Objects.requireNonNull(this.getClass().getClassLoader().getResource("")).getPath();
+        }
+        // 文件名：采用UUID，防止多线程同时生成导致的文件重名
+        String filePath = String.format("%s-%s.xlsx",path,mailboxSendRecord.getSendBatch()+"-雇主险");
+        ExcelData excelData = new ExcelData();
+        excelData.setTitles(Arrays.asList(titles));
+        ExcelUtils.createExcel(filePath,excelData);
+        File excel = new File(filePath);
+
+        //发送邮箱
+        EmailUtilsNew emailUtilsNew = new EmailUtilsNew(mailboxSendRecord.getSendMailbox(), mailbox.getSendPassword());
+
+        //分发邮件
+
+        for (String s : mailboxSendRecord.getReceiveMailbox().split(",|，")) {
+            emailUtilsNew.send(s,mailbox.getSendPassword(),"雇主险-"+mailboxSendRecord.getSendBatch()+"-"+mailbox.getSendName(),"你好，以下是"+ DateUtil.format(new Date(),"yyyy-MM-dd")
+                    +mailbox.getSendName()+"保险人员名单详情见附件",filePath);
+        }
+
+
+        //删除该文件
+        excel.delete();
+    }
+
     private void sendEmailFileEm(List<MailboxSendRecordPolicy> mailboxSendRecordPolicies, MailboxSendRecord mailboxSendRecord, Mailbox mailbox) throws IOException {
 
-        String[] titles = new String[]{"序号","网点编号","网点名称","保险类型","被保险人姓名","被保险人证件类型","被保险人证件号码"};
+        String[] titles = new String[]{"序号","网点编号","网点名称","保险类型","被保险人姓名","被保险人证件类型","被保险人证件号码",
+                "被替换人姓名","被替换人证件类型","被替换人证件号码"};
         List<List<Object>> rows = new ArrayList<>();
-        for(int i = 0;i < mailboxSendRecordPolicies.size();i++){
+        for(int i = 0;i < mailboxSendRecordPolicies.size();i++) {
             MailboxSendRecordPolicy record = mailboxSendRecordPolicies.get(i);
             List<Object> row = new ArrayList<>();
-            row.add(i+1);
-            row.add(mailbox.getSendName());
-            row.add(record.getPolicyNumber());
+            row.add(i + 1);
             row.add(record.getWebsitId());
             row.add(record.getWebsitName());
-            row.add("新增");
+            if (StringUtil.isEmpty(record.getReplaceName()))
+                row.add("新增");
+            else
+                row.add("替换");
             row.add(record.getPolicyName());
             row.add("居民身份证");
             row.add(record.getPolicyIdcard());
+            if (!StringUtil.isEmpty(record.getReplaceName())){
+                row.add(record.getReplaceName());
+                row.add("居民身份证");
+                row.add(record.getReplaceIdcard());
+            }
             rows.add(row);
         }
         // 获取资源文件存放路径，用于临时存放生成的excel文件
@@ -281,7 +340,7 @@ public class AgreementLogic {
             path = Objects.requireNonNull(this.getClass().getClassLoader().getResource("")).getPath();
         }
         // 文件名：采用UUID，防止多线程同时生成导致的文件重名
-        String filePath = String.format("%s-%s.xlsx",path,mailboxSendRecord.getSendBatch()+"-意外险");
+        String filePath = String.format("%s-%s.xlsx",path,mailboxSendRecord.getSendBatch()+"-雇主险");
         ExcelData excelData = new ExcelData();
         excelData.setTitles(Arrays.asList(titles));
         ExcelUtils.createExcel(filePath,excelData);
@@ -293,7 +352,7 @@ public class AgreementLogic {
         //分发邮件
 
         for (String s : mailboxSendRecord.getReceiveMailbox().split(",|，")) {
-            emailUtilsNew.send(s,mailbox.getSendPassword(),"意外险-"+mailboxSendRecord.getSendBatch()+"-"+mailbox.getSendName(),"你好，以下是"+ DateUtil.format(new Date(),"yyyy-MM-dd")
+            emailUtilsNew.send(s,mailbox.getSendPassword(),"雇主险-"+mailboxSendRecord.getSendBatch()+"-"+mailbox.getSendName(),"你好，以下是"+ DateUtil.format(new Date(),"yyyy-MM-dd")
                     +mailbox.getSendName()+"保险人员名单详情见附件",filePath);
         }