diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java index a3747c22..ced68267 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java @@ -176,11 +176,13 @@ public class PayMeeting implements Serializable { /**会议费用*/ @Excel(name = "会议费用", width = 15) @ApiModelProperty(value = "会议费用") + @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal meetingCosts; /**会议费用(标协会员)*/ @Excel(name = "会议费用(标协会员)", width = 15) @ApiModelProperty(value = "会议费用(标协会员)") + @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal meetingCostsVip; /**会议负责人id*/ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java index c9ee0eb4..86e5767c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java @@ -3,6 +3,7 @@ package com.jero.meeting.entity; 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 com.jero.meeting.valid.group.CommonPeople; @@ -302,12 +303,14 @@ public class PayMeetingSituation implements Serializable { * 应收金额 */ @ApiModelProperty(value = "应收金额") + @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal amountReceivable; /** * 实收金额 */ @ApiModelProperty(value = "实收金额") + @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal paidAmount; /**打包*/ @@ -344,5 +347,14 @@ public class PayMeetingSituation implements Serializable { @ApiModelProperty(value = "对接人姓名") private String dockName; + /**审核状态*/ + @Excel(name = "审核状态", width = 15) + @ApiModelProperty(value = "审核状态") + @Dict(dicCode = "signup_status") + private Integer checkResult; + /**审核状态*/ + @ApiModelProperty(value = "审核备注") + @TableField(exist = false) + private String checkRemark; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 17a67f01..5b837b8c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -60,6 +60,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl