From 916db2583c54ae3ba1e1c1f689618f188cbb2b2b Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 21 Mar 2024 14:43:46 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=81=E4=B8=9A=E7=AB=AF=E6=A0=87?= =?UTF-8?q?=E5=8D=8F=E4=BC=9A=E5=91=98=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/common/service/impl/ProjectDetailServiceImpl.java | 2 +- .../java/com/jero/member/entity/TbMemberProjectSubitem.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 6b27531a..4aca5c5b 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 @@ -366,7 +366,7 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { } //会员权益 if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE5)){ - TbMemberProjectSubitem takeEffectInfo = tbMemberProjectSubitemService.getTakeEffectInfo(payCommonProject.getChargeCompanyId()); + TbMemberProjectSubitem takeEffectInfo = tbMemberProjectSubitemService.getTakeEffectInfo(payCommonProject.getChargeCompanyTemporaryId()); if (takeEffectInfo != null){ projectDetailVO.setMemberNo(takeEffectInfo.getMemberNo()); projectDetailVO.setEffectiveDate(takeEffectInfo.getEffectiveDate()); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java index 7ef18988..7bb6289c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java @@ -216,6 +216,7 @@ public class TbMemberProjectSubitem implements Serializable { * rejected 已拒绝 * completed 已完结 */ + @Dict(dicCode = "payment_status") @ApiModelProperty(value = "缴费状态") private String paymentStatus;