diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java index 364aec25..2fb2fad2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java @@ -28,7 +28,10 @@ import com.jero.mail.entity.PayMailBillProject; import com.jero.mail.service.IPayMailBillService; import com.jero.meeting.entity.PayMeetingSituation; import com.jero.member.entity.PayMemberProjectSubitem; +import com.jero.member.entity.TbCertificatePayment; import com.jero.member.entity.TbMemberProjectSubitem; +import com.jero.member.service.ITbCertificatePaymentService; +import com.jero.member.service.ITbMemberProjectSubitemService; import com.jero.payment.entity.PayPaymentRecord; import com.jero.payment.service.IPayPaymentRecordService; import com.jero.project.entity.PayCommonProject; @@ -59,6 +62,10 @@ public class PayPaymentRecordController extends JeroController list = payPaymentRecordService.list(wrapper); + //标协会员、标协证书查出缴费方式 + if(list!=null && list.size()>0){ + if(PayIncomeContractCommon.PROJECT_TYPE5.equals(String.valueOf(list.get(0).getProjectType()))){ + TbMemberProjectSubitem memberProject = tbMemberProjectSubitemService.getById(id); + list.get(0).setPaymentMethod(memberProject.getPaymentMethod()); + } + if(PayIncomeContractCommon.PROJECT_TYPE6.equals(String.valueOf(list.get(0).getProjectType()))){ + TbCertificatePayment tbCertificatePayment = tbCertificatePaymentService.getById(id); + list.get(0).setPaymentMethod(tbCertificatePayment.getPaymentMethod()); + } + } + return Result.OK(list); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java index 752e6d3e..b7052918 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java @@ -109,4 +109,10 @@ public class PayPaymentRecord implements Serializable { @ApiModelProperty(value = "审核说明") private String reviewInstructions; + + /**缴费方式*/ + @Excel(name = "缴费方式", width = 15,dicCode = "meeting_pay_type") + @Dict(dicCode = "meeting_pay_type") + @TableField(exist = false) + private Integer paymentMethod; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java index 81403838..c86490fc 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java @@ -163,6 +163,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl