From 47e23cf659d4cc58bc93b44b16e64e82efcfb08d Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 24 七月 2024 17:34:27 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/WorldCupIncomeVO.java | 21 ++++++++++
cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/StoreIds.java | 13 ++++++
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/StoreIds.java | 13 ++++++
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupIncomeVO.java | 27 +++++++++++++
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupQuery.java | 21 ++++++++++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/WorldCupQuery.java | 21 ++++++++++
6 files changed, 116 insertions(+), 0 deletions(-)
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/StoreIds.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/StoreIds.java
new file mode 100644
index 0000000..86f72d3
--- /dev/null
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/StoreIds.java
@@ -0,0 +1,13 @@
+package com.dsh.communityWorldCup.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 根据门店ids 查询世界杯参赛学员
+ */
+@Data
+public class StoreIds {
+ private List<Integer> storeIds;
+}
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupIncomeVO.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupIncomeVO.java
new file mode 100644
index 0000000..b491ec0
--- /dev/null
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupIncomeVO.java
@@ -0,0 +1,27 @@
+package com.dsh.communityWorldCup.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 报名订单列表VO
+ */
+@Data
+public class WorldCupIncomeVO {
+
+ private String id;
+ private String userName;
+ // 门店id
+ private String phone;
+ private String amount;
+ private String payTime;
+ private String province;
+ private String city;
+ private String storeName;
+ private String storeId;
+
+
+}
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupQuery.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupQuery.java
new file mode 100644
index 0000000..c4ba922
--- /dev/null
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupQuery.java
@@ -0,0 +1,21 @@
+package com.dsh.communityWorldCup.model;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 场地预约记录Query
+ */
+@Data
+public class WorldCupQuery {
+ // 收入时间
+ private String time;
+ // 收入金额
+ private BigDecimal amount;
+ // 用户ids
+ private List<Integer> userIds;
+ // 门店ids
+ private List<Integer> storeIds;
+}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/StoreIds.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/StoreIds.java
new file mode 100644
index 0000000..fcfc16e
--- /dev/null
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/StoreIds.java
@@ -0,0 +1,13 @@
+package com.dsh.course.feignClient.communityWorldCup.Model;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 根据门店ids 查询世界杯参赛学员
+ */
+@Data
+public class StoreIds {
+ private List<Integer> storeIds;
+}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/WorldCupIncomeVO.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/WorldCupIncomeVO.java
new file mode 100644
index 0000000..1d966d6
--- /dev/null
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/WorldCupIncomeVO.java
@@ -0,0 +1,21 @@
+package com.dsh.course.feignClient.communityWorldCup.Model;
+
+import lombok.Data;
+
+/**
+ * 报名订单列表VO
+ */
+@Data
+public class WorldCupIncomeVO {
+
+ private String id;
+ private String userName;
+ // 门店id
+ private String phone;
+ private String amount;
+ private String payTime;
+ private String province;
+ private String city;
+ private String storeName;
+ private String storeId;
+}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/WorldCupQuery.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/WorldCupQuery.java
new file mode 100644
index 0000000..3347059
--- /dev/null
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/WorldCupQuery.java
@@ -0,0 +1,21 @@
+package com.dsh.guns.modular.system.model;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 场地预约记录Query
+ */
+@Data
+public class WorldCupQuery {
+ // 收入时间
+ private String time;
+ // 收入金额
+ private BigDecimal amount;
+ // 用户ids
+ private List<Integer> userIds;
+ // 门店ids
+ private List<Integer> storeIds;
+}
--
Gitblit v1.7.1