收入合同关联会员项目

jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractInstallment.java

@@ -100,4 +100,8 @@ public class PayIncomeContractInstallment implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "手机号")
     private java.lang.String phone;
+    /**邮箱*/
+    @TableField(exist = false)
+    @ApiModelProperty(value = "邮箱")
+    private java.lang.String email;
 }

jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java

@@ -100,4 +100,8 @@ public class PaySpendingContractInstallment implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "手机号")
     private java.lang.String phone;
+    /**邮箱*/
+    @TableField(exist = false)
+    @ApiModelProperty(value = "邮箱")
+    private java.lang.String email;
 }

jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractInstallmentMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.jero.contract.mapper.PayIncomeContractInstallmentMapper">
 
     <select id="getIncomeContract" resultType="com.jero.contract.entity.PayIncomeContractInstallment">
-        SELECT pici.*,pic.contract_name,pic.signed_contacts_temporary_name,pcmt.phone FROM pay_income_contract_installment pici
+        SELECT pici.*,pic.contract_name,pic.signed_contacts_temporary_name,pcmt.phone,pcmt.email FROM pay_income_contract_installment pici
         INNER JOIN pay_income_contract pic ON pici.contract_id = pic.id
         LEFT JOIN pay_contacts_management_temporary pcmt ON pcmt.id = pic.signed_contacts_temporary_id
         WHERE

jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractInstallmentMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.jero.contract.mapper.PaySpendingContractInstallmentMapper">
 
     <select id="getSpendingContract" resultType="com.jero.contract.entity.PaySpendingContractInstallment">
-        select pici.*,pic.contract_name,pic.signed_contacts_temporary_name,pcmt.phone from pay_spending_contract_installment pici
+        select pici.*,pic.contract_name,pic.signed_contacts_temporary_name,pcmt.phone,pcmt.email from pay_spending_contract_installment pici
         inner join pay_spending_contract pic on pici.contract_id = pic.id
         LEFT JOIN pay_contacts_management_temporary pcmt ON pcmt.id = pic.signed_contacts_temporary_id
         where

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractInstallmentServiceImpl.java

@@ -1,11 +1,13 @@
 package com.jero.contract.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.util.HuaWeiSmsUtil;
 import com.jero.common.util.PasswordUtil;
 import com.jero.contract.entity.PayIncomeContractInstallment;
 import com.jero.contract.mapper.PayIncomeContractInstallmentMapper;
 import com.jero.contract.service.IPayIncomeContractInstallmentService;
+import com.jero.modules.message.handle.impl.EmailSendMsgHandle;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,17 +28,24 @@ public class PayIncomeContractInstallmentServiceImpl extends ServiceImpl<PayInco
     private PayIncomeContractInstallmentMapper payIncomeContractInstallmentMapper;
     @Autowired
     private HuaWeiSmsUtil huaWeiSmsUtil;
+    @Autowired
+    private ISysBaseAPI sysBaseAPI;
 
     @Override
     public void sendSMSIncomeContract() {
         List<PayIncomeContractInstallment> list = payIncomeContractInstallmentMapper.getIncomeContract();
         list.forEach(p->{
             if(!StringUtils.isBlank(p.getPhone())){
-                String phone = PasswordUtil.decrypt(p.getPhone());
                 String msg = "中汽数据中心提醒您，贵公司与中汽数据签订的" + p.getContractName() + "合同" + p.getPhaseName()
                         + "期款项时间即将到达，汇款金额" + p.getAccountsReceivableAmount() + "元，请及时汇款，如已经汇款，请忽略此条通知。谢谢合作";
-                // huaWeiSmsUtil.sendVerificationCode(phone,"5","60",msg);
+                // huaWeiSmsUtil.sendVerificationCode(PasswordUtil.decrypt(p.getPhone()),"5","60",msg);
             }
+            if(!StringUtils.isBlank(p.getEmail())){
+                String msg = "中汽数据中心提醒您，贵公司与中汽数据签订的" + p.getContractName() + "合同" + p.getPhaseName()
+                        + "期款项时间即将到达，汇款金额" + p.getAccountsReceivableAmount() + "元，请及时汇款，如已经汇款，请忽略此条通知。谢谢合作";
+                sysBaseAPI.sendEmailMsg(PasswordUtil.decrypt(p.getEmail()), "", msg);
+            }
+            // todo 缺少发消息
         });
     }
 }

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractInstallmentServiceImpl.java

@@ -1,6 +1,7 @@
 package com.jero.contract.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.util.HuaWeiSmsUtil;
 import com.jero.common.util.PasswordUtil;
 import com.jero.contract.entity.PaySpendingContractInstallment;
@@ -25,6 +26,8 @@ public class PaySpendingContractInstallmentServiceImpl extends ServiceImpl<PaySp
 
     @Autowired
     private HuaWeiSmsUtil huaWeiSmsUtil;
+    @Autowired
+    private ISysBaseAPI sysBaseAPI;
 
     @Resource
     private PaySpendingContractInstallmentMapper paySpendingContractInstallmentMapper;
@@ -35,13 +38,17 @@ public class PaySpendingContractInstallmentServiceImpl extends ServiceImpl<PaySp
             // todo 发短信
             list.forEach(p->{
                 if(!StringUtils.isBlank(p.getPhone())){
-                    String phone = PasswordUtil.decrypt(p.getPhone());
                     String msg = "中汽数据中心提醒您，贵公司与中汽数据签订的" + p.getContractName() + "合同" + p.getPhaseName()
                             + "期款项时间即将到达，汇款金额" + p.getAccountsReceivableAmount() + "元，请及时汇款，如已经汇款，请忽略此条通知。谢谢合作";
-                    // huaWeiSmsUtil.sendVerificationCode(phone,"5","60",msg);
+                    // huaWeiSmsUtil.sendVerificationCode(PasswordUtil.decrypt(p.getPhone()),"5","60",msg);
                 }
+                if(!StringUtils.isBlank(p.getEmail())){
+                    String msg = "中汽数据中心提醒您，贵公司与中汽数据签订的" + p.getContractName() + "合同" + p.getPhaseName()
+                            + "期款项时间即将到达，汇款金额" + p.getAccountsReceivableAmount() + "元，请及时汇款，如已经汇款，请忽略此条通知。谢谢合作";
+                    sysBaseAPI.sendEmailMsg(PasswordUtil.decrypt(p.getEmail()), "", msg);
+                }
+                // todo 缺少发消息
             });
-
         }
     }
 }

jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java

@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletRequest;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.common.api.vo.Result;
 import com.jero.common.service.ProjectDetailService;
+import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.util.PasswordUtil;
 import com.jero.common.util.ValidUtil;
@@ -47,6 +48,8 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 	 private IPayContactsManagementTemporaryService payContactsManagementTemporaryService;
 	 @Autowired
 	 private IPayWorkingGroupService payWorkingGroupService;
+	 @Autowired
+	 private ISysBaseAPI sysBaseAPI;
 
 	 /**
 	  * 分页列表查询
@@ -151,8 +154,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 			 }
 			 String msg = "中汽数据中心提醒您，贵公司与中汽数据签订的" + payWorkingGroup.getWorkingGroupProject()
 					 + "项目款项仍未结余，请及时汇款，如已经汇款，请忽略此条通知。谢谢合作";
-			 EmailSendMsgHandle emailHandle = new EmailSendMsgHandle();
+			 sysBaseAPI.sendEmailMsg(PasswordUtil.decrypt(listContactsEmail.get(0).getEmail()), "", msg);
-			 emailHandle.SendMsg(PasswordUtil.decrypt(listContactsEmail.get(0).getEmail()), "", msg);
 		 });
 		 // todo 缺少发送消息
 		 return Result.OK("添加成功！");