需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/common/PayController.java

@@ -74,6 +74,10 @@ public class PayController {
                     } else if ("ES".contains(id.substring(0, 2))) {
                         // 二手订单
                         payLogic.payCall6(id, transactionId, totalFee, params);
+                        payLogic.payCall5(id, transactionId, totalFee, params);
+                    } else if ("PW".contains(id.substring(0, 2))) {
+                        // 保险订单
+                        payLogic.payCall7(id, transactionId, totalFee, params);
                     } else {
                         //商城订单支付回调
                         payLogic.payCall(id, transactionId, totalFee);

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/enums/PolicyOrderStutasEnum.java

@@ -0,0 +1,19 @@
+package com.gree.mall.miniapp.enums;
+
+import com.gree.mall.miniapp.enums.base.BaseEnum;
+import lombok.Getter;
+
+@Getter
+public enum  PolicyOrderStutasEnum implements BaseEnum {
+    WAIT("WAIT","未支付"),
+    DSX("DSX","待生效"),
+    BZZ("BZZ","保障中"),
+    YSX("YSX","已生效"),
+    ;
+
+    PolicyOrderStutasEnum(String key, String remark) {
+        this.key=key;this.remark = remark;
+    }
+    private String key;
+    private String remark;
+}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/policy/WorkerLogic.java

@@ -2,6 +2,7 @@ package com.gree.mall.miniapp.logic.policy;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.miniapp.bean.PayDetail;
 import com.gree.mall.miniapp.bean.policy.PolicyDetail;
@@ -11,6 +12,7 @@ import com.gree.mall.miniapp.bean.user.CurrentCompanyWechat;
 import com.gree.mall.miniapp.enums.ExamineWorkerStatusEnum;
 import com.gree.mall.miniapp.enums.IsEnum;
 import com.gree.mall.miniapp.enums.IsYesNoEnum;
+import com.gree.mall.miniapp.enums.PolicyOrderStutasEnum;
 import com.gree.mall.miniapp.logic.common.CommonLogic;
 import com.gree.mall.miniapp.logic.common.outside.WechatLogic;
 import com.gree.mall.miniapp.plus.entity.*;
@@ -21,6 +23,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -57,6 +60,9 @@ public class WorkerLogic {
     @Autowired
     PolicyOrderService policyOrderService;
 
+    @Autowired
+    UserService userService;
+
 
 
     public List<WorkerRemind> remind() {
@@ -212,14 +218,107 @@ public class WorkerLogic {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
         Policy policy = policyService.getById(policyId);
 
+        WebsitUser websiUser = websitUserService.lambdaQuery()
+                .eq(WebsitUser::getUserId, currentCompanyWechat.getUserId())
+                .eq(WebsitUser::getWebsitId, websitId).one();
+
+
         AdminWebsit adminWebsit = adminWebsitService.getById(websitId);
 
+        List<WorkerPolicy> workerPolicies = workerPolicyService.lambdaQuery().eq(WorkerPolicy::getWebsitId, websitId)
+                .eq(WorkerPolicy::getWorkerId, currentCompanyWechat.getUser().getWorkerNumber())
+                .eq(WorkerPolicy::getPolicyType, "AC")
+                .orderByDesc(WorkerPolicy::getEndTime)
+                .list();
+
+        //取师傅最后时间的后一天，小于保险时间就取保险时间
+
+        Date startTime = new Date();
+
+        if (!CollectionUtils.isEmpty(workerPolicies)){
+            startTime = DateUtil.beginOfDay(DateUtil.offsetDay(workerPolicies.get(0).getEndTime(),1));
+        }
+
+        if (startTime.before(policy.getStartTime()))
+            startTime = policy.getStartTime();
+
         PolicyOrder policyOrder = new PolicyOrder();
+        policyOrder.setId("PW"+IdWorker.getIdStr());
+
+        policyOrder.setPolicyOrderStatus(PolicyOrderStutasEnum.WAIT.getKey());
+        policyOrder.setPolicyName(policy.getPolicyName());
+        policyOrder.setPolicyOrderId(policy.getPolicyNumber());
+
+        policyOrder.setWebsitUserId(websiUser.getId());
+
+
+        policyOrder.setStartTime(startTime);
+        policyOrder.setEndTime(policy.getEndTime());
+
+        int month = DateUtil.month(startTime);
+        int month2 = DateUtil.month(policy.getEndTime());
+
+        Integer integer = month2-month+1;
+
+        BigDecimal price = this.getPayPrice(integer,policy);
+
+        policyOrder.setPayAmount(policy.getPolicyPrice().multiply(price));
+
+        policyOrder.setIsSend(IsYesNoEnum.NO.getKey());
+        policyOrder.setIsReceipt(IsYesNoEnum.NO.getKey());
+
+
+
+        policyOrder.setBelongCompany(adminWebsit.getBelongCompany());
+        policyOrder.setBelongCompanyCode(adminWebsit.getBelongCompanyCode());
+
+        policyOrder.setPolicyName("工伤险");
+        policyOrder.setCompanyWechatId(adminWebsit.getCompanyWechatId());
+        policyOrder.setCompanyWechatName(adminWebsit.getCompanyWechatName());
+        policyOrder.setPolicyOrderId(IdWorker.getIdStr());
+        policyOrder.setId(policyOrder.getPolicyOrderId());
+        policyOrder.setWebsitId(adminWebsit.getWebsitId());
+        policyOrder.setWebsitName(adminWebsit.getName());
+        policyOrder.setWorkerIdcard(currentCompanyWechat.getUser().getIdCard());
+        policyOrder.setWorkerMobile(currentCompanyWechat.getUser().getMobile());
+        policyOrder.setWorkerName(currentCompanyWechat.getUser().getNickName());
+        policyOrder.setWorkerNumber(currentCompanyWechat.getUser().getWorkerNumber());
+        policyOrder.setBuyUnit(adminWebsit.getInsureSteadUnit());
+        policyOrder.setBuyUnit(adminWebsit.getInsureSteadUnit());
+        policyOrder.setType("IN");
+
         policyOrder.insert();
 
         return policyOrder;
     }
 
+    private BigDecimal getPayPrice(Integer integer,Policy policy) {
+        if (integer.equals(1))
+            return policy.getMonth1();
+        if (integer.equals(2))
+            return policy.getMonth2();
+        if (integer.equals(3))
+            return policy.getMonth3();
+        if (integer.equals(4))
+            return policy.getMonth4();
+        if (integer.equals(5))
+            return policy.getMonth5();
+        if (integer.equals(6))
+            return policy.getMonth6();
+        if (integer.equals(7)
+            return policy.getMonth7();
+        if (integer.equals(8))
+            return policy.getMonth8();
+        if (integer.equals(9))
+            return policy.getMonth9();
+        if (integer.equals(10))
+            return policy.getMonth10();
+        if (integer.equals(11))
+            return policy.getMonth11();
+        if (integer.equals(12))
+            return policy.getMonth12();
+    }
+
     public PayDetail pay(String policyOrderId, HttpServletRequest request) {
 
         String ip = IpUtil.getIpAddr(request);

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/user/PayLogic.java

@@ -106,6 +106,12 @@ public class PayLogic {
     @Autowired
     CarouselMapService carouselMapService;
 
+    @Autowired
+    PolicyOrderService policyOrderService;
+
+    @Autowired
+    PolicyService policyService;
+
     public void payCall(String id,String transactionId,BigDecimal totalFee) throws JDOMException, IOException {
 
         OrderInfo orderInfo = orderInfoService.getById(id);
@@ -946,4 +952,63 @@ public class PayLogic {
         }
         return map;
     }
+
+    public void payCall7(String id, String transactionId, BigDecimal totalFee, Map<String, String> params) {
+
+        String timeEnd = params.get("time_end");// 支付时间
+        String openid = params.get("sub_openid");// opendid
+        String mchId = params.get("mch_id");// 商户号
+        String subMchId = params.get("sub_mch_id");// 子商户号
+        String attach = params.get("attach");// 订单单号
+
+        PolicyOrder policyOrder = policyOrderService.getById(id);
+        if (policyOrder.getIsPay().equals(IsYesNoEnum.YES.getKey())) {
+            log.info("请勿重复支付,id:{}", attach);
+            return;
+        }
+
+        //实际支付金额
+        BigDecimal payAmount = policyOrder.getPayAmount();
+
+        //判断金额是否支付正确
+        if(totalFee.compareTo(payAmount) != 0){
+            log.error("【支付回调严重bug】......orderId:{},微信回调金额:{},订单实际支付金额:{}", attach, totalFee, payAmount);
+            return;
+        }
+        policyOrder.setPayTime(new Date());
+        policyOrder.setIsPay(IsYesNoEnum.YES.getKey());
+
+        policyOrder.setPolicyOrderStatus(PolicyOrderStutasEnum.DSX.getKey());
+
+        policyOrder.setTransactionId(transactionId);
+
+        policyOrder.updateById();
+
+
+        Policy policy = policyService.getById(policyOrder.getId());
+
+
+        //生成师傅待生效保险
+        WorkerPolicy workerPolicy = new WorkerPolicy();
+        workerPolicy.setWebsitId(policyOrder.getWorkerNumber());
+        workerPolicy.setStatus("WAIT_ON");
+        workerPolicy.setCompany(policy.getCompany());
+        workerPolicy.setType("IN");
+        workerPolicy.setPolicyName(policy.getPolicyName());
+        workerPolicy.setPolicyOrder(policy.getPolicyNumber());
+        workerPolicy.setOrderId(policy.getId());
+        workerPolicy.setPolicyType("AC");
+        workerPolicy.setStartTime(policyOrder.getStartTime());
+        workerPolicy.setEndTime(policyOrder.getEndTime());
+        workerPolicy.setWebsitUserId(policyOrder.getWebsitUserId());
+        workerPolicy.setWebsitId(policyOrder.getWebsitId());
+        workerPolicy.setWebsitName(policyOrder.getWebsitName());
+        workerPolicy.setPolicyPrice(policyOrder.getPayAmount());
+        workerPolicy.setWorkerName(policyOrder.getWorkerName());
+        workerPolicy.setWorkerId(policyOrder.getWorkerNumber());
+
+
+        workerPolicy.insert();
+
+    }
 }

mall-server-api/pom.xml

@@ -430,6 +430,12 @@
             <scope>system</scope>
             <systemPath>${pom.basedir}/src/main/resources/libs/open-api-1.8.11.RELEASE.jar</systemPath>
         </dependency>
+        <dependency>
+            <groupId>com.sun.mail</groupId>
+            <artifactId>javax.mail</artifactId>
+            <version>1.6.2</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

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

@@ -88,5 +88,13 @@ public class AgreementController {
     }
 
 
-
+    @PostMapping("/del")
+    @ApiOperation("修改保险协议配置")
+    public ResponseHelper del(
+            @ApiParam(value = "id", required = true) @RequestParam String id,
+            HttpServletRequest request
+    ) throws ParseException {
+        agreementLogic.del(id);
+        return ResponseHelper.success();
+    }
 }

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

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.text.ParseException;
 
 @Slf4j
@@ -81,7 +82,7 @@ public class MailboxController {
     }
 
     @PostMapping("/detailRecord")
-    @ApiOperation("保险方案管理详情")
+    @ApiOperation("邮箱记录详情")
     public ResponseHelper<MailboxSendRecord> detail(
             @ApiParam(value = "id", required = true) @RequestParam String id,
             HttpServletRequest request
@@ -117,4 +118,13 @@ public class MailboxController {
         FieldUtils.exportData(increVOIPage.getRecords(), zfireParam.getExportFields(), request, response);
     }
 
+    @ApiOperation(value = "已发邮箱记录-重新发送")
+    @PostMapping("resend")
+
+    public ResponseHelper send(@ApiParam(value = "批次号", required = false)
+                                   @RequestParam(required = false) String sendBatch) throws IOException {
+        agreementLogic.sendEmail(sendBatch);
+        return ResponseHelper.success();
+    }
+
 }

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

@@ -1,22 +1,28 @@
 package com.gree.mall.manager.logic.policy;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gree.mall.manager.bean.ExcelData;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.policy.*;
 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.email.EmailUtilsNew;
+import com.gree.mall.manager.utils.excel.ExcelUtils;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import com.gree.mall.manager.zfire.util.FieldUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -25,6 +31,9 @@ public class AgreementLogic {
     @Autowired
     PolicyCMapper policyCMapper;
 
+    @Value("${spring.profiles.active}")
+    private String active;
+
 
     @Autowired
     CommonLogic commonLogic;
@@ -47,6 +56,9 @@ public class AgreementLogic {
     @Autowired
     MailboxReceiveService mailboxReceiveService;
 
+    @Autowired
+    MailboxSendRecordPolicyService mailboxSendRecordPolicyService;
+
 
 
     public IPage<AgreementVo> list(Page page, ZfireParamBean zfireParam) {
@@ -189,4 +201,161 @@ public class AgreementLogic {
         IPage<MailboxSendRecordPolicyVo> policyVoIPage = policyCMapper.listPolicy(page, zfireParam,adminCompanyIds);
         return policyVoIPage;
     }
+
+
+    public void sendEmail(String sendBatch) throws IOException {
+        MailboxSendRecord mailboxSendRecord = mailboxSendRecordService.getById(sendBatch);
+        List<MailboxSendRecordPolicy> mailboxSendRecordPolicies = mailboxSendRecordPolicyService.lambdaQuery().eq(MailboxSendRecordPolicy::getSendBatch, sendBatch).list();
+
+        Mailbox mailbox = mailboxService.getById("1");
+
+        List<MailboxReceive> mailboxReceives = mailboxReceiveService.lambdaQuery().eq(MailboxReceive::getMailboxId, "1").list();
+
+
+
+        if (mailboxSendRecord.getPolicyType().equals("AC")) {
+
+            //发邮件
+            try {
+                this.sendEmailFile(mailboxSendRecordPolicies, mailboxSendRecord, mailbox);
+                mailboxSendRecord.setSendStatus("OK");
+                mailboxSendRecord.updateById();
+            } catch (Exception e) {
+                mailboxSendRecord.setSendStatus("NO");
+                mailboxSendRecord.updateById();
+            }
+        }
+
+        if (mailboxSendRecord.getPolicyType().equals("EM")) {
+
+            //发邮件
+            try {
+                this.sendEmailFileEm(mailboxSendRecordPolicies, mailboxSendRecord, mailbox);
+                mailboxSendRecord.setSendStatus("OK");
+                mailboxSendRecord.updateById();
+            } catch (Exception e) {
+                mailboxSendRecord.setSendStatus("NO");
+                mailboxSendRecord.updateById();
+            }
+        }
+
+
+/*        if (mailboxSendRecord.getPolicyType().equals("IN")) {
+
+            //发邮件
+            try {
+                this.sendEmailFileIn(mailboxSendRecordPolicies, mailboxSendRecord, mailbox);
+                mailboxSendRecord.setSendStatus("OK");
+                mailboxSendRecord.updateById();
+            } catch (Exception e) {
+                mailboxSendRecord.setSendStatus("NO");
+                mailboxSendRecord.updateById();
+            }
+        }*/
+
+
+
+    }
+
+    private void sendEmailFileEm(List<MailboxSendRecordPolicy> mailboxSendRecordPolicies, MailboxSendRecord mailboxSendRecord, Mailbox mailbox) throws IOException {
+
+        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(mailbox.getSendName());
+            row.add(record.getPolicyNumber());
+            row.add(record.getWebsitId());
+            row.add(record.getWebsitName());
+            row.add("新增");
+            row.add(record.getPolicyName());
+            row.add("居民身份证");
+            row.add(record.getPolicyIdcard());
+            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();
+    }
+
+
+    /**
+     * 发送买保险名单的邮件
+     * @param mailboxSendRecordPolicies
+     * @param mailboxSendRecord
+     * @param mailbox
+     *
+     */
+    private void sendEmailFile(List<MailboxSendRecordPolicy> mailboxSendRecordPolicies,MailboxSendRecord mailboxSendRecord,Mailbox mailbox) throws IOException {
+
+        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(mailbox.getSendName());
+            row.add(record.getPolicyNumber());
+            row.add(record.getWebsitId());
+            row.add(record.getWebsitName());
+            row.add("新增");
+            row.add(record.getPolicyName());
+            row.add("居民身份证");
+            row.add(record.getPolicyIdcard());
+            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();
+    }
+
+    public void del(String id) {
+        agreementService.removeById(id);
+    }
 }

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

@@ -365,6 +365,7 @@ public class WorkerManagerLogic {
             policyOrder.setBelongCompany(adminWebsit.getBelongCompany());
             policyOrder.setBelongCompanyCode(adminWebsit.getBelongCompanyCode());
             policyOrder.setPolicyOrderStatus(PolicyOrderEmStutasEnum.XG.getKey());
+            policyOrder.setPolicyName("雇主险");
             policyOrder.setCompanyWechatId(adminWebsit.getCompanyWechatId());
             policyOrder.setCompanyWechatName(adminWebsit.getCompanyWechatName());
             policyOrder.setPolicyOrderId(IdWorker.getIdStr());
@@ -388,6 +389,7 @@ public class WorkerManagerLogic {
         policyOrder.setBelongCompany(adminWebsit.getBelongCompany());
         policyOrder.setBelongCompanyCode(adminWebsit.getBelongCompanyCode());
         policyOrder.setPolicyOrderStatus(PolicyOrderInStutasEnum.DGM.getKey());
+        policyOrder.setPolicyName("工伤险");
         policyOrder.setCompanyWechatId(adminWebsit.getCompanyWechatId());
         policyOrder.setCompanyWechatName(adminWebsit.getCompanyWechatName());
         policyOrder.setPolicyOrderId(IdWorker.getIdStr());

mall-server-api/src/main/java/com/gree/mall/manager/utils/email/EmailUtilsNew.java

@@ -0,0 +1,243 @@
+package com.gree.mall.manager.utils.email;
+
+
+import cn.hutool.core.date.DateUtil;
+import com.sun.mail.imap.IMAPStore;
+import lombok.extern.slf4j.Slf4j;
+
+
+import javax.activation.DataHandler;
+import javax.activation.FileDataSource;
+import javax.mail.*;
+import javax.mail.internet.*;
+
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Properties;
+
+@Slf4j
+public class EmailUtilsNew {
+
+    private static final String ALIDM_SMTP_HOST = "smtpdm.aliyun.com";
+    private static final int ALIDM_SMTP_PORT = 80;// 或80
+
+
+
+    // 发件人的账号 和 密码
+    private String user;
+    private String password;
+
+    public EmailUtilsNew() {
+            this("zhongju@gm.zfire.top", "PRivate123");
+    }
+
+    public EmailUtilsNew(String user, String password) {
+        this.user = user;
+        this.password = password;
+    }
+
+//    public static void main(String[] args) throws IOException, MessagingException {
+//        //new EmailUtilsNew().send("448797381@qq.com", "测试1", "nihao显示");
+//        //new EmailUtilsNew().send("448797381@qq.com", "测试1", "市劳动纠纷联赛积分了","B:/21.11仓储维修.xls");
+//        new EmailUtilsNew().receEmail();
+//    }
+
+    /**
+     * 发送邮件
+     * @param toEmail  收件人邮箱地址
+     * @param subject 邮件标题
+     * @param content  邮件内容 可以是html内容
+     */
+    public void send(String toEmail, String subject, String content) {
+        Session session = loadMailSession();
+        // session.setDebug(true);
+        // 创建邮件消息
+        MimeMessage message = new MimeMessage(session);
+        try {
+            // 设置发件人
+            message.setFrom(new InternetAddress(user));
+            Address[] a = new Address[1];
+            a[0] = new InternetAddress(user);
+            message.setReplyTo(a);
+            // 设置收件人
+            InternetAddress to = new InternetAddress(toEmail);
+            message.setRecipient(MimeMessage.RecipientType.TO, to);
+            // 设置邮件标题
+            message.setSubject(subject);
+            // 设置邮件的内容体
+            message.setContent(content, "text/html;charset=UTF-8");
+            // 发送邮件
+            Transport.send(message);
+        } catch (Exception e) {
+            log.error("【发送邮件失败】",e);
+        }
+    }
+
+
+    /**
+     * 发送邮件 带附件
+     * @param toEmail  收件人邮箱地址
+     * @param subject  邮件标题
+     * @param content  邮件内容 可以是html内容
+     * @param attachPath 附件路径
+     */
+    public void send(String toEmail,String emailReceAccount, String subject, String content, String attachPath) {
+        Session session = loadMailSession();
+
+        MimeMessage mm = new MimeMessage(session);
+        try {
+            //mm.addHeader("Disposition-Notification-To", "448797381@qq.com");
+            //发件人
+            mm.setFrom(new InternetAddress(user));
+            //收件人
+            mm.setRecipient(Message.RecipientType.TO, new InternetAddress(toEmail)); // 设置收件人
+
+            Address[] a = new Address[1];
+            a[0] = new InternetAddress(emailReceAccount);
+            mm.setReplyTo(a);
+            // mm.setRecipient(Message.RecipientType.CC, new
+            // InternetAddress("XXXX@qq.com")); //设置抄送人
+            //标题
+            mm.setSubject(subject);
+            //内容
+            Multipart multipart = new MimeMultipart();
+            //body部分
+            BodyPart contentPart = new MimeBodyPart();
+            contentPart.setContent(content, "text/html;charset=utf-8");
+            multipart.addBodyPart(contentPart);
+
+            //附件部分
+            BodyPart attachPart = new MimeBodyPart();
+            FileDataSource fileDataSource = new FileDataSource(attachPath);
+            attachPart.setDataHandler(new DataHandler(fileDataSource));
+            attachPart.setFileName(MimeUtility.encodeText(fileDataSource.getName()));
+            multipart.addBodyPart(attachPart);
+
+            mm.setContent(multipart);
+            Transport.send(mm);
+        } catch (Exception e) {
+            String err = e.getMessage();
+            // 在这里处理message内容， 格式是固定的
+            System.out.println(err);
+        }
+
+    }
+
+    public static void main(String[] args) throws IOException, MessagingException {
+        new com.gree.mall.manager.utils.email.EmailUtilsNew("15920909481@163.com","WVLNTJADXDSHHSNU").receEmail("");
+    }
+
+
+    /**
+     * 判断是否收到了保险回执
+     * @throws MessagingException
+     * @throws IOException
+     */
+    public Boolean receEmail(String receEmail) throws MessagingException, IOException {
+
+        Properties props = new Properties();
+        props.setProperty("mail.store.protocol", "imap");
+        props.setProperty("mail.imap.host", "imap.qq.com");
+        props.setProperty("mail.imap.port", "993");
+        props.setProperty("mail.imap.auth.login.disable", "true");
+        props.setProperty("mail.imap.ssl.enable", "true");
+
+        HashMap IAM = new HashMap();
+        //带上IMAP ID信息，由key和value组成，例如name，version，vendor，support-email等。
+        // 这个value的值随便写就行
+        IAM.put("name","李斌");
+        IAM.put("version","1.0.0");
+        IAM.put("vendor","myclient");
+        IAM.put("support-email","15920909481@163.com");
+
+        Session session = Session.getInstance(props, new Authenticator() {
+            public PasswordAuthentication getPasswordAuthentication() {
+                //发件人邮件用户名、授权码
+                return new PasswordAuthentication(user, password);
+            }
+        });
+        IMAPStore store = (IMAPStore)session.getStore("imap");
+        // imap.qq.com
+        store.connect("imap.163.com", user, password);
+        store.id(IAM);
+        // 获得邮箱内的邮件夹Folder对象，以"只读"打开
+        Folder folder = store.getFolder("INBOX");
+        //folder.open(Folder.READ_ONLY);
+        folder.open(Folder.READ_WRITE);
+
+        // 获得邮件夹Folder内的所有邮件Message对象
+        Message [] messages = folder.getMessages();
+
+        int mailCounts = messages.length;
+        for(int i = 0; i < mailCounts; i++) {
+
+            String subject = messages[i].getSubject();
+            String from = (messages[i].getFrom()[0]).toString();
+            Date receivedDate = messages[i].getReceivedDate();
+            //今天接收的邮件
+            if(receivedDate.getTime() > DateUtil.beginOfDay(new Date()).getTime() && from.indexOf(receEmail) > -1){
+                messages[i].setFlag(Flags.Flag.SEEN, true);
+                return true;
+            }
+
+//            System.out.println("第 " + (i+1) + "封邮件的主题：" + subject);
+//            System.out.println("第 " + (i+1) + "封邮件的发件人地址：" + from);
+//
+//            System.out.println("是否打开该邮件(yes/no)?：");
+//            BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
+//            String input = br.readLine();
+//            if("yes".equalsIgnoreCase(input)) {
+//                // 直接输出到控制台中
+//                messages[i].writeTo(System.out);
+//            }
+        }
+        folder.close(false);
+        store.close();
+        return false;
+    }
+
+
+
+
+
+
+
+    private Session loadMailSession() {
+        try {
+            // 配置发送邮件的环境属性
+            final Properties props = new Properties();
+            // 表示SMTP发送邮件，需要进行身份验证
+            props.put("mail.smtp.auth", "true");
+            props.put("mail.smtp.host", ALIDM_SMTP_HOST);
+            // props.put("mail.smtp.port", ALIDM_SMTP_PORT);
+            // 如果使用ssl，则去掉使用25端口的配置，进行如下配置,
+            props.put("mail.smtp.socketFactory.class","javax.net.ssl.SSLSocketFactory");
+            props.put("mail.smtp.socketFactory.port", "465");
+            props.put("mail.smtp.port", "465");
+            // 发件人的账号
+            props.put("mail.user", user);
+            // 访问SMTP服务时需要提供的密码
+            props.put("mail.password", password);
+            // 构建授权信息，用于进行SMTP进行身份验证
+            Authenticator authenticator = new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    // 用户名、密码
+                    String userName = props.getProperty("mail.user");
+                    String password = props.getProperty("mail.password");
+                    return new PasswordAuthentication(userName, password);
+                }
+            };
+            // 使用环境属性和授权信息，创建邮件会话
+            return Session.getInstance(props, authenticator);
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.println("mail session is null");
+        }
+        return null;
+    }
+
+
+}

mall-server-api/src/main/java/com/gree/mall/manager/utils/excel/ExcelUtils.java

@@ -3,8 +3,12 @@ package com.gree.mall.manager.utils.excel;
 
 
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.EasyExcelFactory;
+import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.read.listener.PageReadListener;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy;
 import com.gree.mall.manager.bean.ExcelData;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.utils.DateUtils;
@@ -23,13 +27,8 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.awt.Color;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.io.*;
+import java.util.*;
 
 @Slf4j
 public class ExcelUtils {
@@ -186,6 +185,34 @@ public class ExcelUtils {
             }
         }
     }
+    public static void createExcel(String filePath,ExcelData excelData) throws IOException {
+        OutputStream out = null;
+        try {
+            //标题
+            List<List<String>> titles = new ArrayList<>();
+            for(String title : excelData.getTitles()){
+                titles.add(Arrays.asList(title));
+            }
+            out = new FileOutputStream(filePath);
+            ExcelWriter build = EasyExcelFactory.write(out).head(titles).build();
+            // 写仅有一个 Sheet 的 Excel 文件, 此场景较为通用
+            WriteSheet writeSheet = EasyExcel.writerSheet(0, "Sheet").head(titles)
+                    .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
+                    .build();
+            build.write(excelData.getRows(),writeSheet).finish();
+            // 关闭流
+            out.flush();
+        } catch (FileNotFoundException e) {
+            throw new RuntimeException(e);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }finally {
+            if(out != null)
+                out.close();
+        }
+    }
+
+
 
     private static void setBorder(CellStyle style, BorderStyle border, XSSFColor color) {
         style.setBorderTop(border);