This commit is contained in:
zt
2025-06-13 09:03:19 +08:00
parent 34d5724db7
commit 8646e62504
13 changed files with 177 additions and 28 deletions

View File

@ -45,4 +45,6 @@ public class ActivityPayDTO {
private String voucherId;
private String transactionId;
private String openid;
}

View File

@ -38,4 +38,6 @@ public class ActivityPaySaveReqVO {
private String voucherId;
private String transactionId;
private String openid;
}

View File

@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 活动用餐桌子 Response VO")
@ -47,4 +48,7 @@ public class ActivityTableRespVO {
private String name;
private LocalDate reserveTime;
private String type;
}

View File

@ -30,4 +30,6 @@ public class ActivityTableSaveReqVO {
@Schema(description = "电话")
private String mobile;
private String type;
}

View File

@ -62,4 +62,6 @@ public class ActivityPayDO extends BaseDO {
private String voucher;
private String transactionId;
private String openid;
}

View File

@ -56,4 +56,6 @@ public class ActivityTableDO extends BaseDO {
private LocalDate reserveTime;
private String type;
}

View File

@ -123,6 +123,7 @@ public class ActivityTableServiceImpl implements ActivityTableService {
LocalDate localDate = LocalDate.parse(time, formatter);
return activityTableMapper.selectList(Wrappers.lambdaQuery(ActivityTableDO.class)
.eq(ActivityTableDO::getReserveTime, localDate)
.eq(ActivityTableDO::getType, "0")
.eq(ActivityTableDO::getActivityId, activityId));
}
@ -138,6 +139,7 @@ public class ActivityTableServiceImpl implements ActivityTableService {
List<ActivityTableDO> activityTableDOS = activityTableMapper.selectList(Wrappers.lambdaQuery(ActivityTableDO.class)
.eq(ActivityTableDO::getReserveTime, localDate)
.eq(ActivityTableDO::getActivityId, vo.getActivityId())
.eq(ActivityTableDO::getType, "0")
.in(ActivityTableDO::getSerialNumber, vo.getSerialNumbers()));
if (!activityTableDOS.isEmpty()) {