From 09c9168941347acb448d52e030f5b3204c0a3805 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Tue, 14 Sep 2021 10:03:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E9=80=81=E7=9F=AD=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/PayIncomeContractInstallment.java | 13 +++++++++++++ .../entity/PaySpendingContractInstallment.java | 13 +++++++++++++ .../mapper/PayIncomeContractInstallmentMapper.java | 12 +++++++++++- .../PaySpendingContractInstallmentMapper.java | 11 +++++++++++ .../xml/PayIncomeContractInstallmentMapper.xml | 8 ++++++++ .../xml/PaySpendingContractInstallmentMapper.xml | 8 ++++++++ .../IPayIncomeContractInstallmentService.java | 10 +++++++++- .../IPaySpendingContractInstallmentService.java | 9 +++++++++ .../PayIncomeContractInstallmentServiceImpl.java | 13 +++++++++++++ .../service/impl/PayIncomeContractServiceImpl.java | 1 - .../PaySpendingContractInstallmentServiceImpl.java | 13 +++++++++++++ 11 files changed, 108 insertions(+), 3 deletions(-) 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 1950e715..40e7d7ad 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 @@ -4,6 +4,7 @@ import java.io.Serializable; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -87,4 +88,16 @@ public class PayIncomeContractInstallment implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新时间") private java.util.Date updateTime; + /**临时签订单位名称*/ + @TableField(exist = false) + @ApiModelProperty(value = "签订单位名称") + private java.lang.String signedCompanyTemporaryName; + /**合同名称*/ + @TableField(exist = false) + @ApiModelProperty(value = "合同名称") + private java.lang.String contractName; + /**手机号*/ + @TableField(exist = false) + @ApiModelProperty(value = "手机号") + private java.lang.String phone; } 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 b035cb40..7f0afc4a 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 @@ -4,6 +4,7 @@ import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -88,4 +89,16 @@ public class PaySpendingContractInstallment implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新时间") private Date updateTime; + /**临时签订单位名称*/ + @TableField(exist = false) + @ApiModelProperty(value = "签订单位名称") + private java.lang.String signedCompanyTemporaryName; + /**合同名称*/ + @TableField(exist = false) + @ApiModelProperty(value = "合同名称") + private java.lang.String contractName; + /**手机号*/ + @TableField(exist = false) + @ApiModelProperty(value = "手机号") + private java.lang.String phone; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PayIncomeContractInstallmentMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PayIncomeContractInstallmentMapper.java index f13f7b68..e2fb82fb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PayIncomeContractInstallmentMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PayIncomeContractInstallmentMapper.java @@ -3,6 +3,8 @@ package com.jero.contract.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jero.contract.entity.PayIncomeContractInstallment; +import java.util.List; + /** * @Description: pay_income_contract_installment * @Author: jeecg-boot @@ -10,5 +12,13 @@ import com.jero.contract.entity.PayIncomeContractInstallment; * @Version: V1.0 */ public interface PayIncomeContractInstallmentMapper extends BaseMapper { - + /** + * @Description 获取满足前一周发送短信的分期信息 + * @Author lqt + * @Date 2021/9/14 + * @Param + * @Return + * @Exception + */ + List getIncomeContract(); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractInstallmentMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractInstallmentMapper.java index 1813b7c0..186d27a8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractInstallmentMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractInstallmentMapper.java @@ -4,6 +4,8 @@ package com.jero.contract.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jero.contract.entity.PaySpendingContractInstallment; +import java.util.List; + /** * @Description: pay_spending_contract_installment * @Author: jeecg-boot @@ -12,4 +14,13 @@ import com.jero.contract.entity.PaySpendingContractInstallment; */ public interface PaySpendingContractInstallmentMapper extends BaseMapper { + /** + * @Description 获取满足前一周发送短信的分期信息 + * @Author lqt + * @Date 2021/9/14 + * @Param + * @Return + * @Exception + */ + List getSpendingContract(); } 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 c7c602bb..0e841c3d 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 @@ -2,4 +2,12 @@ + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractInstallmentMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractInstallmentMapper.xml index 0122a7ed..1d15e12c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractInstallmentMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractInstallmentMapper.xml @@ -2,4 +2,12 @@ + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPayIncomeContractInstallmentService.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPayIncomeContractInstallmentService.java index 70f9a271..35f89544 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPayIncomeContractInstallmentService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPayIncomeContractInstallmentService.java @@ -10,5 +10,13 @@ import com.jero.contract.entity.PayIncomeContractInstallment; * @Version: V1.0 */ public interface IPayIncomeContractInstallmentService extends IService { - + /** + * @Description 收入合同每阶段前一周给合同签订单位的企业联系人发送付款提醒 + * @Author lqt + * @Date 2021/9/14 + * @Param + * @Return + * @Exception + */ + void sendSMSIncomeContract(); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractInstallmentService.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractInstallmentService.java index 09667fde..46958f48 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractInstallmentService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractInstallmentService.java @@ -11,5 +11,14 @@ import com.jero.contract.entity.PaySpendingContractInstallment; * @Version: V1.0 */ public interface IPaySpendingContractInstallmentService extends IService { + /** + * @Description 支出合同每阶段前一周给合同签订单位的企业联系人发送付款提醒 + * @Author lqt + * @Date 2021/9/14 + * @Param + * @Return + * @Exception + */ + void sendSMSSpendingContract(); } 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 c6c92eeb..35febb9b 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 @@ -4,8 +4,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.contract.entity.PayIncomeContractInstallment; import com.jero.contract.mapper.PayIncomeContractInstallmentMapper; import com.jero.contract.service.IPayIncomeContractInstallmentService; +import org.apache.commons.collections.CollectionUtils; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; + /** * @Description: pay_income_contract_installment * @Author: jeecg-boot @@ -14,5 +18,14 @@ import org.springframework.stereotype.Service; */ @Service public class PayIncomeContractInstallmentServiceImpl extends ServiceImpl implements IPayIncomeContractInstallmentService { + @Resource + private PayIncomeContractInstallmentMapper payIncomeContractInstallmentMapper; + @Override + public void sendSMSIncomeContract() { + List list = payIncomeContractInstallmentMapper.getIncomeContract(); + if(!CollectionUtils.isEmpty(list)){ + // todo 发送短信 + } + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java index 1fcee7fd..ea951a94 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java @@ -27,7 +27,6 @@ import com.jero.pack.entity.PayPackCompany; import com.jero.pack.entity.PayPackCompanyProject; import com.jero.pack.service.IPayPackCompanyProjectService; import com.jero.pack.service.IPayPackCompanyService; -import com.jero.project.common.PayProjectCommon; import com.jero.project.entity.PayCommonProject; import com.jero.project.entity.PayWorkingGroup; import com.jero.project.entity.PayWorkingGroupSubItem; 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 7391a8ec..b03541cf 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 @@ -4,8 +4,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.contract.entity.PaySpendingContractInstallment; import com.jero.contract.mapper.PaySpendingContractInstallmentMapper; import com.jero.contract.service.IPaySpendingContractInstallmentService; +import org.apache.commons.collections.CollectionUtils; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; + /** * @Description: pay_spending_contract_installment * @Author: jeecg-boot @@ -15,4 +19,13 @@ import org.springframework.stereotype.Service; @Service public class PaySpendingContractInstallmentServiceImpl extends ServiceImpl implements IPaySpendingContractInstallmentService { + @Resource + private PaySpendingContractInstallmentMapper paySpendingContractInstallmentMapper; + @Override + public void sendSMSSpendingContract() { + List list = paySpendingContractInstallmentMapper.getSpendingContract(); + if(!CollectionUtils.isEmpty(list)){ + // todo 发短信 + } + } }