From 912bf8aad828c5cde67720864c8697d03a1a7bad Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 14:46:17 +0800
Subject: [PATCH] 合并代码
---
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java | 3 ++-
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java | 24 ++++++++++++++++++++++++
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCup.java | 7 ++++++-
3 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java
index 2cf0dda..3b9abaa 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java
@@ -511,6 +511,30 @@
/**
+ * 添加社区世界杯
+ * @param worldCup
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/worldCup/addWorldCup")
+ public Integer addWorldCup(@RequestBody WorldCup worldCup){
+ worldCupService.save(worldCup);
+ return worldCup.getId();
+ }
+
+
+ /**
+ * 添加社区世界杯和门店关系数据
+ * @param worldCupStore
+ */
+ @ResponseBody
+ @PostMapping("/worldCup/addWorldCupStore")
+ public void addWorldCupStore(@RequestBody WorldCupStore worldCupStore){
+ worldCupStoreService.save(worldCupStore);
+ }
+
+
+ /**
* 获取比赛管理列表数据
* @param worldCupListAll
* @return
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCup.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCup.java
index 41dde4b..72c5bf9 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCup.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCup.java
@@ -65,7 +65,7 @@
* 支付方式（1=免费，2=现金支付，3=玩湃币支付，4=课时支付）
*/
@TableField("payType")
- private Integer payType;
+ private String payType;
/**
* 现金
*/
@@ -152,4 +152,9 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("createTime")
private Date createTime;
+ /**
+ * 已比赛次数
+ */
+ @TableField("matchNumber")
+ private Integer matchNumber;
}
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java
index fd18a7e..76d75a2 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java
@@ -378,7 +378,8 @@
worldCupPayment.setEntrant(paymentWorldCup.getIds());
int num = JSON.parseArray(paymentWorldCup.getIds()).size();
//不免费
- if(worldCup.getPayType() != 0){
+ String payType1 = worldCup.getPayType().split(",")[0];
+ if(!"0".equals(payType1)){
Integer payType = paymentWorldCup.getPayType();
//微信
if(payType == 1){
--
Gitblit v1.7.1