From c697ed09cb1e257bc54603213b304e0f156326a6 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 02 十一月 2023 10:34:07 +0800
Subject: [PATCH] 支付会员送券功能补充 运营商权限bug修改
---
cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionInfo.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionInfo.java b/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionInfo.java
index 8452551..bd251ec 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionInfo.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionInfo.java
@@ -5,6 +5,7 @@
import lombok.Data;
import java.util.List;
+import java.util.Map;
/**
* @author zhibing.pu
@@ -14,7 +15,7 @@
@ApiModel
public class CompetitionInfo {
@ApiModelProperty("赛事id")
- private Integer id;
+ private Long id;
@ApiModelProperty("赛事图片")
private String imgs;
@ApiModelProperty("赛事名称")
@@ -23,12 +24,16 @@
private Integer registerCondition;
@ApiModelProperty("门店名称")
private String storeName;
+ @ApiModelProperty("门店照片")
+ private String storeCoverDrawing;
@ApiModelProperty("门店地址")
private String storeAddress;
@ApiModelProperty("门店经度")
private String storeLon;
@ApiModelProperty("门店纬度")
private String storeLat;
+ @ApiModelProperty("距离")
+ private Double distance;
@ApiModelProperty("报名结束时间")
private String registerEndTime;
@ApiModelProperty("开始时间")
@@ -43,10 +48,12 @@
private String city;
@ApiModelProperty("参赛地址")
private String address;
- @ApiModelProperty("支付方式（1=现金，2=玩湃币支付，3=课时支付）")
- private Integer payType;
- @ApiModelProperty("支付价格")
- private Double price;
+ @ApiModelProperty("现金支付价格")
+ private Double cashPrice;
+ @ApiModelProperty("玩湃币支付价格")
+ private Integer playPaiCoin;
+ @ApiModelProperty("课时支付价格")
+ private Integer classPrice;
@ApiModelProperty("赛事简介")
private String introduction;
@ApiModelProperty("报名须知")
@@ -55,4 +62,12 @@
private Integer apply;
@ApiModelProperty("报名参赛人员")
private List<ParticipantVo> participant;
+ @ApiModelProperty("状态（1=未开始，2=进行中，3=已结束，4=已取消）")
+ private Integer status;
+ @ApiModelProperty("支付金额")
+ private Double payMoney;
+ @ApiModelProperty("支付方式（1=微信，2=支付宝，3=玩湃币，4=课时）")
+ private Integer payType;
+ @ApiModelProperty("门店信息")
+ private List<Map<String,Object>> storeInfos;
}
--
Gitblit v1.7.1