diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingSubitemCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingSubitemCommon.java new file mode 100644 index 00000000..58f0c374 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingSubitemCommon.java @@ -0,0 +1,20 @@ +package com.jero.meeting.common; + +/** + * @author liJiaRao + * @date 2021-09-08 18:56 + */ +public class MeetingSubitemCommon { + /** + * 嘉宾 + */ + public final static String JIA_BIN = "1"; + /** + * 参会人 + */ + public final static String CAN_HUI_REN = "1"; + /** + * 内部企业 + */ + public final static String NEI_BU_QI_YE = "1"; +} 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 7f094334..7c4fd664 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 @@ -1,11 +1,12 @@ package com.jero.meeting.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.jero.meeting.valid.group.CommonPeople; +import com.jero.meeting.valid.group.Guest; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -16,8 +17,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import javax.validation.constraints.Max; -import javax.validation.constraints.NotNull; +import javax.validation.constraints.*; /** * @Description: 会议报名信息 @@ -61,11 +61,13 @@ public class PayMeetingSituation implements Serializable { /**会议id*/ @Excel(name = "会议id", width = 15) @ApiModelProperty(value = "会议id") + @NotBlank(message = "会议项目不能为空") private String meetingId; /**企业id*/ - @Excel(name = "企业id", width = 15) @ApiModelProperty(value = "企业id") + @NotBlank(message = "企业名称不能为空") + @Size(max = 50, message = "企业名称最大为50字符") private String companyId; /** @@ -80,8 +82,9 @@ public class PayMeetingSituation implements Serializable { private String companyName; /**企业联系人id*/ - @Excel(name = "企业联系人id", width = 15) @ApiModelProperty(value = "企业联系人id") + @NotBlank(message = "企业联系人不能为空") + @Size(max = 50, message = "企业联系人最大为50字符") private String companyContactId; /** @@ -96,38 +99,40 @@ public class PayMeetingSituation implements Serializable { private String companyContactName; /**职务*/ - @Excel(name = "职务", width = 15) @ApiModelProperty(value = "职务") private String post; /**手机号*/ - @Excel(name = "手机号", width = 15) @ApiModelProperty(value = "手机号") private String phone; /**邮箱*/ - @Excel(name = "邮箱", width = 15) @ApiModelProperty(value = "邮箱") private String email; /**身份*/ - @Excel(name = "身份", width = 15) @ApiModelProperty(value = "身份") + @Dict(dicCode = "meet_identify_type") private Integer identity; /**嘉宾类型*/ - @Excel(name = "嘉宾类型", width = 15) @ApiModelProperty(value = "嘉宾类型") + @NotNull(message = "请选择嘉宾类型",groups = Guest.class) + @Min(value = 1,groups = Guest.class) + @Max(value = 4,groups = Guest.class) private Integer guestType; /**演讲题目*/ @Excel(name = "演讲题目", width = 15) @ApiModelProperty(value = "演讲题目") + @NotBlank(message = "演讲题目不能为空",groups = Guest.class) + @Size(max = 50, message = "演讲题目最大为50字符") private String speechTopic; /**演讲ppt*/ @Excel(name = "演讲ppt", width = 15) @ApiModelProperty(value = "演讲ppt") + @NotBlank(message = "演讲ppt不能为空",groups = Guest.class) private String speechPpt; /**照片*/ @@ -258,11 +263,16 @@ public class PayMeetingSituation implements Serializable { /**缴费方式*/ @Excel(name = "缴费方式", width = 15) @ApiModelProperty(value = "缴费方式") + @NotNull(message = "缴费方式不能为空",groups = CommonPeople.class) + @Min(1) + @Max(3) private Integer payMode; /**需要发票*/ @Excel(name = "需要发票", width = 15) @ApiModelProperty(value = "需要发票") + @Min(0) + @Max(2) private Integer needInvoice; /**付款凭证*/ 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 5041d202..58b8917b 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 @@ -1,8 +1,14 @@ package com.jero.meeting.service.impl; +import com.jero.common.util.ValidUtil; +import com.jero.meeting.common.MeetingSubitemCommon; import com.jero.meeting.entity.PayMeetingSituation; import com.jero.meeting.mapper.PayMeetingSituationMapper; import com.jero.meeting.service.IPayMeetingSituationService; +import com.jero.meeting.vo.CommonPeopleVO; +import com.jero.meeting.vo.MeetingEntity; +import com.jero.project.common.PayProjectCommon; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -21,7 +27,28 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl