by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增支付状态枚举接口
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details

Browse Source
This commit is contained in:
yuyongle 2025-07-05 15:45:50 +08:00
parent 487480c0e1
commit 322a9944e8
6 changed files with 106 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MeetBookingController.java
View File

@ -38,25 +38,13 @@ public class MeetBookingController extends BaseController {
private final IMeetBookingService meetBookingService;
/**
* 查询会议预约列表
* 查询会议预约记录列表
*/
@SaCheckPermission("property:meetbooking:list")
@GetMapping("/list")
public TableDataInfo<MeetBookingVo> list(MeetBookingBo bo, PageQuery pageQuery) {
return meetBookingService.queryPageList(bo, pageQuery);
}
///**
// * 导出会议预约列表
// */
//@SaCheckPermission("property:meetbooking:export")
//@Log(title = "会议预约", businessType = BusinessType.EXPORT)
//@PostMapping("/export")
//public void export(MeetBookingBo bo, HttpServletResponse response) {
// List<MeetBookingVo> list = meetBookingService.queryList(bo);
// ExcelUtil.exportExcel(list, "会议预约", MeetBookingVo.class, response);
//}
/**
* 获取会议预约详细信息
*
@ -91,16 +79,16 @@ public class MeetBookingController extends BaseController {
return toAjax(meetBookingService.updateByBo(bo));
}
/**
* 删除会议预约
*
* @param ids 主键串
*/
@SaCheckPermission("property:meetbooking:remove")
@Log(title = "会议预约", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("ids") Long[] ids) {
return toAjax(meetBookingService.deleteWithValidByIds(List.of(ids), true));
}
///**
// * 删除会议预约
// *
// * @param ids 主键串
// */
//@SaCheckPermission("property:meetbooking:remove")
//@Log(title = "会议预约", businessType = BusinessType.DELETE)
//@DeleteMapping("/{ids}")
//public R<Void> remove(@NotEmpty(message = "主键不能为空")
// @PathVariable("ids") Long[] ids) {
// return toAjax(meetBookingService.deleteWithValidByIds(List.of(ids), true));
//}
}

10
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MeetController.java
View File

@ -50,6 +50,16 @@ public class MeetController extends BaseController {
return meetService.queryPageList(bo, pageQuery);
}
/**
* 查询未预约会议
* @param bo
* @return
*/
@Operation
@GetMapping("/notlist")
public R<List<MeetVo>> notlist(MeetBo bo) {
return R.ok(meetService.queryList(bo));
}
///**
// * 导出会议室管理列表
// */

34
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/enums/BookingPayStatusEnum.java Normal file
View File

@ -0,0 +1,34 @@
package org.dromara.property.domain.enums;
/**
* @Author:yuyongle
* @Date:2025/7/4 17:58
* @Description:
**/
public enum BookingPayStatusEnum {
/**
* 待确认
*/
ENAABLE("待支付", "0"),
/**
* 待提货
*/
DEACTIVATE("已支付", "1");
private final String name;
private final String value;
BookingPayStatusEnum(String name, String value) {
this.name = name;
this.value = value;
}
public String getName() {
return this.name;
}
public String getValue() {
return this.value;
}
}

30
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/enums/BookingStatusEnum.java Normal file
View File

@ -0,0 +1,30 @@
package org.dromara.property.domain.enums;
/**
* @Author:yuyongle
* @Date:2025/7/5 14:13
* @Description:
**/
public enum BookingStatusEnum {
READYTOSTART("待开始", "0"),
PENDINGREVIEW("待审核", "1"),
FINISHED("已结束", "1");
private final String name;
private final String value;
BookingStatusEnum(String name, String value) {
this.name = name;
this.value = value;
}
public String getName() {
return this.name;
}
public String getValue() {
return this.value;
}
}

9
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/enums/PayStatusEnum.java
View File

@ -1,9 +0,0 @@
package org.dromara.property.domain.enums;
/**
* @Author:yuyongle
* @Date:2025/7/4 17:58
* @Description:
**/
public enum PayStatusEnum {
}

21
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/EnumFetcherServiceImpl.java
View File

@ -1,6 +1,8 @@
package org.dromara.property.service.impl;
import lombok.RequiredArgsConstructor;
import org.dromara.property.domain.enums.BookingPayStatusEnum;
import org.dromara.property.domain.enums.BookingStatusEnum;
import org.dromara.property.domain.enums.MeetAttachStatusEnum;
import org.dromara.property.domain.enums.MeetStatusEnum;
import org.dromara.property.service.EnumFetcherService;
@ -41,10 +43,14 @@ public class EnumFetcherServiceImpl implements EnumFetcherService {
return meetAttachService.getMeetAttachSelectDate(type);
case "getMeetAttachType":
return meetAttachService.getMeetAttachSelectDate(type);
case "getMeetAttachStatus()":
case "getMeetAttachStatus":
return getMeetAttachStatus();
case "getMeetBookingPerson()":
case "getMeetBookingPerson":
return meetBookingService.getMeetBooking(type);
case "getMeetBookingPayStatus":
return getMeetBookingPayStatus();
case "getMeetBookingStatus":
return getMeetBookingStatus();
default:
throw new IllegalArgumentException("Unknown type: " + type);
}
@ -54,8 +60,19 @@ public class EnumFetcherServiceImpl implements EnumFetcherService {
return java.util.Arrays.stream(MeetStatusEnum.values())
.collect(Collectors.toMap(MeetStatusEnum::getValue, MeetStatusEnum::getName));
}
Map<String, String> getMeetAttachStatus() {
return java.util.Arrays.stream(MeetAttachStatusEnum.values())
.collect(Collectors.toMap(MeetAttachStatusEnum::getValue, MeetAttachStatusEnum::getName));
}
Map<String, String> getMeetBookingPayStatus() {
return java.util.Arrays.stream(BookingPayStatusEnum.values())
.collect(Collectors.toMap(BookingPayStatusEnum::getValue, BookingPayStatusEnum::getName));
}
Map<String, String>getMeetBookingStatus() {
return java.util.Arrays.stream(BookingStatusEnum.values())
.collect(Collectors.toMap(BookingStatusEnum::getValue, BookingStatusEnum::getName));
}
}