diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractInstallment.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractInstallment.java index 40e7d7ad..fc28f745 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractInstallment.java +++ b/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; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java index 5058a58c..5e89a242 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java +++ b/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; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractInstallmentMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractInstallmentMapper.xml index 0e841c3d..c8bd75c8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractInstallmentMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractInstallmentMapper.xml @@ -3,7 +3,7 @@ - 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 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractInstallmentServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractInstallmentServiceImpl.java index 25ef02e2..772531e6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractInstallmentServiceImpl.java +++ b/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 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 缺少发消息 }); } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractInstallmentServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractInstallmentServiceImpl.java index 606e6af7..7147f65b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractInstallmentServiceImpl.java +++ b/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{ 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 缺少发消息 }); - } } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index ff123407..fc819cc6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/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