From eec19c0d6efa2427fa0361dbfc2dad907b132db2 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 29 Dec 2021 15:17:20 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E5=8F=91=E5=B8=83=E4=BC=9A=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/元旦前上线新增.sql | 9 +++++++++ .../controller/StandardsMeetingController.java | 14 ++++++++++++++ .../java/com/jero/meeting/entity/PayMeeting.java | 5 +++++ .../jero/meeting/service/IPayMeetingService.java | 2 ++ .../service/impl/PayMeetingServiceImpl.java | 10 ++++++++++ .../java/com/jero/meeting/vo/PayMeetingVO.java | 5 +++++ 6 files changed, 45 insertions(+) create mode 100644 db/元旦前上线新增.sql diff --git a/db/元旦前上线新增.sql b/db/元旦前上线新增.sql new file mode 100644 index 00000000..7ebdc134 --- /dev/null +++ b/db/元旦前上线新增.sql @@ -0,0 +1,9 @@ +ALTER TABLE `pay_meeting` + ADD COLUMN `release` tinyint(1) NULL COMMENT '是否发布' AFTER `remind`; + +INSERT INTO sys_dict (id, dict_name, dict_code, description, del_flag, create_by, create_time) +VALUES ('1476073127111663617', '发布状态', 'release', '', 0, 'LKGLZ', '2021-12-29 14:10:32'); +INSERT INTO sys_dict_item (id, dict_id, item_text, item_value, description, sort_order, status, create_by, create_time) +VALUES ('1476073184066117633', '1476073127111663617', '未发布', '0', '', 1, 1, 'LKGLZ', '2021-12-29 14:10:45'); +INSERT INTO sys_dict_item (id, dict_id, item_text, item_value, description, sort_order, status, create_by, create_time) +VALUES ('1476073211874353153', '1476073127111663617', '已发布', '1', '', 1, 1, 'LKGLZ', '2021-12-29 14:10:52'); \ No newline at end of file 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 4b557769..394673ae 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 @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.enums.CompanyMessageEnums; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.vo.LoginUser; @@ -19,6 +20,7 @@ import com.jero.meeting.entity.PayMeetingHotelContacts; import com.jero.meeting.service.IPayMeetingHotelContactsService; import com.jero.meeting.service.IPayMeetingService; import com.jero.meeting.vo.PayMeetingVO; +import com.jero.meeting.vo.PublishReminderVO; import com.jero.meeting.vo.UploadFileVO; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.system.volid.group.UpdateGroup; @@ -280,4 +282,16 @@ public class StandardsMeetingController extends JeroController release(@RequestBody PublishReminderVO publishReminderVO) { + payMeetingService.release(publishReminderVO); + return Result.OK(); + } + } 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 f06096fe..596ea04d 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 @@ -262,6 +262,11 @@ public class PayMeeting implements Serializable { @Dict(dicCode = "yn") private Integer remind; + /**发布状态*/ + @ApiModelProperty(value = "发布状态") + @Dict(dicCode = "release") + private Integer release; + /**收款二维码*/ @ApiModelProperty(value = "收款二维码") private String paymentQrCode; 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 e7e5c82c..718444a1 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 @@ -94,4 +94,6 @@ public interface IPayMeetingService extends IService { PayMeeting getMeetingBySituationId(String situationId); PayMeeting queryByIdAndTime(String id, Date now); + + void release(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 1f88268f..d8103f04 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 @@ -342,6 +342,7 @@ public class PayMeetingServiceImpl extends ServiceImpl meetingIds = publishReminderVO.getMeetingIds(); + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.in(PayMeeting::getId,meetingIds); + wrapper.set(PayMeeting::getRelease,MeetingCommon.REMIND_1); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java index 347da5c4..29d243c2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java @@ -267,6 +267,11 @@ public class PayMeetingVO implements Serializable { @ApiModelProperty(value = "是否提醒") private Integer remind; + /**发布状态*/ + @ApiModelProperty(value = "发布状态") + @Dict(dicCode = "release") + private Integer release; + /**收款二维码*/ @ApiModelProperty(value = "收款二维码") private String paymentQrCode;