From cf8dddcb2fbef6fcf6b66714c58ff66baa4aaf54 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 8 Mar 2024 15:26:27 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E5=8D=8F=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98-=20=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E5=90=8E=E6=9B=B4=E6=96=B0=E6=9C=89=E6=95=88=E6=9C=9F=EF=BC=8C?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectDetailServiceImpl.java | 13 ++++++++++++ .../com/jero/common/vo/ProjectDetailVO.java | 20 +++++++++++++++++++ .../service/impl/PayMailBillServiceImpl.java | 2 +- .../mapper/TbMemberProjectSubitemMapper.java | 2 +- .../ITbMemberProjectSubitemService.java | 4 +++- .../TbMemberProjectSubitemServiceImpl.java | 9 +++++++-- 6 files changed, 45 insertions(+), 5 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java index b242e605..6b27531a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java @@ -29,6 +29,8 @@ import com.jero.mail.entity.PayMailBill; import com.jero.mail.entity.PayMailBillProject; import com.jero.mail.service.IPayMailBillProjectService; import com.jero.mail.service.IPayMailBillService; +import com.jero.member.entity.TbMemberProjectSubitem; +import com.jero.member.service.ITbMemberProjectSubitemService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import com.jero.payment.entity.PayPaymentRecord; @@ -94,6 +96,8 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { private IPayDraftingGroupSubItemService payDraftingGroupSubItemService; @Resource private IPayDraftingGroupSubItemContactsService payDraftingGroupSubItemContactsService; + @Resource + private ITbMemberProjectSubitemService tbMemberProjectSubitemService; @Override public ProjectDetailVO getProjectDetail(String projectId) { @@ -360,6 +364,15 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { projectDetailVO.setContactAddress(payContactsManagementTemporary.getContactAddress()); } } + //会员权益 + if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE5)){ + TbMemberProjectSubitem takeEffectInfo = tbMemberProjectSubitemService.getTakeEffectInfo(payCommonProject.getChargeCompanyId()); + if (takeEffectInfo != null){ + projectDetailVO.setMemberNo(takeEffectInfo.getMemberNo()); + projectDetailVO.setEffectiveDate(takeEffectInfo.getEffectiveDate()); + projectDetailVO.setInvalidationDate(takeEffectInfo.getInvalidationDate()); + } + } // 到账信息 LambdaQueryWrapper queryWrapperPayPaymentRecord = new LambdaQueryWrapper<>(); queryWrapperPayPaymentRecord.eq(PayPaymentRecord::getProjectId,projectId); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java index 77d27300..0c1a5d5c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java @@ -7,9 +7,11 @@ import com.jero.payment.entity.PayPaymentRecord; import com.jero.project.entity.PayWorkingGroupSubItemContacts; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.math.BigDecimal; +import java.util.Date; import java.util.List; @Data @@ -289,5 +291,23 @@ public class ProjectDetailVO implements Serializable { /**起草组成员联系人**/ @ApiModelProperty(value = "起草组成员联系人") private List payDraftingGroupSubItemContactsLists; + /** + * 会员编号 + */ + @ApiModelProperty(value = "会员编号") + private String memberNo; + + /** 生效日期 */ + @ApiModelProperty(value = "生效日期") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date effectiveDate; + /** + * 失效日期 + */ + @ApiModelProperty(value = "失效日期") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date invalidationDate; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java index cc775e16..05811d73 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java @@ -203,7 +203,7 @@ public class PayMailBillServiceImpl extends ServiceImpl getAllTakeEffectByCompanyId(@Param("companyId") String companyId); - @Select("SELECT IFNULL(MAX(SUBSTRING(member_no,13)),'0') + 1 FROM tb_member_info WHERE member_no LIKE concat(#{date},'%')") + @Select("SELECT IFNULL(MAX(SUBSTRING(member_no,13)),'0') + 1 FROM tb_member_project_subitem WHERE member_no LIKE concat(#{date},'%')") Integer getMaxMemberNo(@Param("date") String date); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java index 25f43dff..239c9a47 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java @@ -82,7 +82,9 @@ public interface ITbMemberProjectSubitemService extends IService allByCompanyId = tbMemberProjectSubitemMapper.getAllTakeEffectByCompanyId(companyId); @@ -266,6 +267,10 @@ public class TbMemberProjectSubitemServiceImpl extends ServiceImpl 0){ + if (takeEffectInfo == null || DateUtil.compare(date,takeEffectInfo.getInvalidationDate()) > 0){ //获得当月1日 effectiveDate = DateUtil.beginOfMonth(date); // 如果是续费 @@ -292,7 +297,7 @@ public class TbMemberProjectSubitemServiceImpl extends ServiceImpl