diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java index ee923a43..a338ace2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java @@ -301,7 +301,7 @@ public class StandardsMeetingController extends JeroController standardsRelease(@RequestBody PublishReminderVO publishReminderVO) { - payMeetingService.release(publishReminderVO); + payMeetingService.standardsRelease(publishReminderVO); return Result.OK(); } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java index 718444a1..b5d87e0f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java @@ -96,4 +96,6 @@ public interface IPayMeetingService extends IService { PayMeeting queryByIdAndTime(String id, Date now); void release(PublishReminderVO publishReminderVO); + + void standardsRelease(PublishReminderVO publishReminderVO); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index 5a83eedc..2041e30c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -1026,6 +1026,34 @@ public class PayMeetingServiceImpl extends ServiceImpl meetingIds = publishReminderVO.getMeetingIds(); + List meetingIds1 = new ArrayList<>(); + List meetingIds2 = new ArrayList<>(); + for (String meetingId : meetingIds) { + PayMeeting meeting = getById(meetingId); + Integer tbMeetingType = meeting.getTbMeetingType(); + if (Objects.equals(tbMeetingType,1)||Objects.equals(tbMeetingType,2)){ + meetingIds1.add(meetingId); + } + if (Objects.equals(tbMeetingType,3)){ + meetingIds2.add(meetingId); + } + } + if (!meetingIds1.isEmpty()){ + PublishReminderVO publishReminderVO1 = new PublishReminderVO(); + publishReminderVO1.setMeetingIds(meetingIds1); + AuthenticationUtils.post("/stablecrosstraining/stableCrossTraining/incomingRelease",null,publishReminderVO1); + } + if (!meetingIds2.isEmpty()){ + PublishReminderVO publishReminderVO1 = new PublishReminderVO(); + publishReminderVO1.setMeetingIds(meetingIds2); + AuthenticationUtils.post("/meetingNews/meetingNews/incomingRelease",null,publishReminderVO1); + } + } + + @Override + public void standardsRelease(PublishReminderVO publishReminderVO) { List meetingIds = publishReminderVO.getMeetingIds(); LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); wrapper.in(PayMeeting::getId,meetingIds); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/meetingNews/entity/MeetingNews.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/meetingNews/entity/MeetingNews.java index 66d7279d..06a4f76d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/meetingNews/entity/MeetingNews.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/meetingNews/entity/MeetingNews.java @@ -5,6 +5,7 @@ import java.util.List; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.jero.common.aspect.annotation.Dict; import com.jero.common.system.base.entity.JeroEntity; import com.jero.standards.jiudian.hotelcontact.entity.HotelContact; import lombok.Data; @@ -113,6 +114,11 @@ public class MeetingNews extends JeroEntity { @TableField("administrator") private String administrator; + /**发布状态*/ + @ApiModelProperty(value = "发布状态") + @Dict(dicCode = "release") + private Integer isRelease; + @ApiModelProperty(value = "1.宣贯, 2.年会") @TableField(exist = false) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/entity/StableCrossTraining.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/entity/StableCrossTraining.java index d80d4bd0..43d0875f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/entity/StableCrossTraining.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/entity/StableCrossTraining.java @@ -184,6 +184,11 @@ public class StableCrossTraining extends JeroEntity { @TableField("payment_qr_code") private String paymentQrCode; + /**发布状态*/ + @ApiModelProperty(value = "发布状态") + @Dict(dicCode = "release") + private Integer isRelease; + // @ApiModelProperty(value = "创建人") // @TableField("create_by") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java index 1d861261..608c7749 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java @@ -109,6 +109,7 @@ public class StableCrossTrainingServiceImpl extends ServiceImpl hotelList = new ArrayList<>(); List hotelContactsList1 = payMeeting.getHotelContactsList(); for (PayMeetingHotelContacts meetingHotelContacts : hotelContactsList1) { @@ -138,6 +139,7 @@ public class StableCrossTrainingServiceImpl extends ServiceImpl hotelList = new ArrayList<>(); List hotelContactsList1 = payMeeting.getHotelContactsList(); for (PayMeetingHotelContacts meetingHotelContacts : hotelContactsList1) {