From b23b243473fc9ab20ca62eebf3668c143e2e7d23 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 15:30:53 +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/competition/model/CompetitionUser.java | 5 ++
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 4 +-
cloud-server-competition/src/main/resources/mapper/ParticipantMapper.xml | 32 +++++-----------
cloud-server-management/src/main/webapp/WEB-INF/view/login.html | 6 +-
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 2
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java | 5 ++
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java | 1
cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetitionUser.js | 2 +
cloud-server-management/src/main/webapp/static/modular/system/worldCup/registeredPersonnel.js | 1
cloud-server-competition/src/main/java/com/dsh/competition/feignclient/model/CompetitionUser.java | 5 ++
cloud-server-competition/src/main/resources/logback-spring.xml | 2
11 files changed, 35 insertions(+), 30 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index f66961f..55afd69 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -1955,7 +1955,7 @@
userPointsMerchandise.setPayStatus(2);
userPointsMerchandise.setPaymentTime(new Date());
userPointsMerchandise.setOrderNumber(tradeNo);
- userPointsMerchandise.setPayType(2);
+ userPointsMerchandise.setCashPayType(2);
userPointsMerchandise.setInsertTime(null);
userPointsMerchandise.setUserId(null);
mcClient.updateDetailsUserPointMercase(userPointsMerchandise);
@@ -2121,7 +2121,7 @@
userPointsMerchandise.setPayStatus(2);
userPointsMerchandise.setPaymentTime(new Date());
userPointsMerchandise.setOrderNumber(transaction_id);
- userPointsMerchandise.setPayType(1);
+ userPointsMerchandise.setCashPayType(1);
mcClient.updateDetailsUserPointMercase(userPointsMerchandise);
TAppUser tAppUser = baseMapper.selectById(userPointsMerchandise.getUserId());
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index 596e698..61c4018 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -1568,7 +1568,7 @@
if (ToolUtil.isNotEmpty(pointMercharsPayedVo.getStatus())) {
userPointsMerchandiseLambdaQueryWrapper.eq(UserPointsMerchandise::getStatus, pointMercharsPayedVo.getStatus());
}
- List<UserPointsMerchandise> list = upmseService.list(userPointsMerchandiseLambdaQueryWrapper);
+ List<UserPointsMerchandise> list = upmseService.list(userPointsMerchandiseLambdaQueryWrapper.orderByDesc(UserPointsMerchandise::getPaymentTime));
System.out.println(list);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
if (list.size() > 0) {
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java
index e88601b..ad368b2 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java
@@ -311,9 +311,10 @@
map.put("total", 0);
return map;
}
- List<WorldCupPaymentParticipant> list1 = this.list(new QueryWrapper<WorldCupPaymentParticipant>().in("worldCupPaymentId", collect));
+ List<WorldCupPaymentParticipant> list1 = this.list(new QueryWrapper<WorldCupPaymentParticipant>().in("worldCupPaymentId", collect).orderByDesc("createTime"));
List<Map<String, Object>> list2 = new ArrayList<>();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
+ SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
for (WorldCupPaymentParticipant on : list1) {
WorldCupPayment worldCupPayment = worldCupPaymentService.getById(on.getWorldCupPaymentId());
Map<String, Object> map1 = new HashMap<>();
@@ -337,6 +338,7 @@
map1.put("phone", ToolUtil.isEmpty(tStudent.getPhone()) ? appUser.getPhone() : tStudent.getPhone());
map1.put("idcard", tStudent.getIdCard());
map1.put("state", worldCupPayment.getPayStatus() - 1);
+ map1.put("insertTime", sdf1.format(worldCupPayment.getPayTime()));
}else{
Participant participant = participantClient.getParticipant(on.getParticipantId());
if(ToolUtil.isNotEmpty(name) && participant.getName().indexOf(name) == -1){
@@ -356,6 +358,7 @@
map1.put("phone", ToolUtil.isNotEmpty(participant.getPhone()) ? participant.getPhone() : appUser.getPhone());
map1.put("idcard", participant.getIdcard());
map1.put("state", worldCupPayment.getPayStatus() - 1);
+ map1.put("insertTime", sdf1.format(worldCupPayment.getPayTime()));
}
list2.add(map1);
}
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/model/CompetitionUser.java b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/model/CompetitionUser.java
index d4aa26b..2a6811c 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/model/CompetitionUser.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/model/CompetitionUser.java
@@ -1,6 +1,9 @@
package com.dsh.competition.feignclient.model;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+
+import java.util.Date;
@Data
public class CompetitionUser {
@@ -11,4 +14,6 @@
private String phone;
private String idCard;
private Integer state;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date insertTime;
}
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java
index f79e786..d56c271 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java
@@ -303,6 +303,7 @@
if(null != paymentCompetition){
competitionUser.setState(paymentCompetition.getPayStatus());
}
+ competitionUser.setInsertTime(userCompetition.getInsertTime());
list.add(competitionUser);
}
Page<CompetitionUser> page = new Page<>();
diff --git a/cloud-server-competition/src/main/resources/logback-spring.xml b/cloud-server-competition/src/main/resources/logback-spring.xml
index eb725a2..ac1b3df 100644
--- a/cloud-server-competition/src/main/resources/logback-spring.xml
+++ b/cloud-server-competition/src/main/resources/logback-spring.xml
@@ -215,7 +215,7 @@
</springProfile>
<springProfile name="prod">
- <root level="warn">
+ <root level="info">
<!-- 生产环境最好不配置console写文件 -->
<appender-ref ref="DEBUG_FILE"/>
<appender-ref ref="INFO_FILE"/>
diff --git a/cloud-server-competition/src/main/resources/mapper/ParticipantMapper.xml b/cloud-server-competition/src/main/resources/mapper/ParticipantMapper.xml
index 5c000c2..2ea92f7 100644
--- a/cloud-server-competition/src/main/resources/mapper/ParticipantMapper.xml
+++ b/cloud-server-competition/src/main/resources/mapper/ParticipantMapper.xml
@@ -15,39 +15,27 @@
</select>
<select id="getPeopleFromId1" resultType="com.dsh.competition.entity.UserCompetition">
- select * from (
- select
- a.*
- from t_user_competition a
- left join t_payment_competition b on (a.paymentCompetitionId = b.id)
- where b.state = 1 and b.payStatus != 1 and a.competitionId = #{id}
+ select * from t_user_competition where competitionId = #{id} and paymentCompetitionId in (
+ select id from t_payment_competition where state = 1 and payStatus != 1
<if test="null != state and state == 1">
- and b.payStatus = 2
+ and payStatus = 2
</if>
<if test="null != state and state == 3">
- and b.payStatus = 3
+ and payStatus = 3
</if>
- group by a.id
- ) as aa where aa.id is not null order by aa.insertTime desc limit #{offset}, #{limit}
+ ) order by insertTime desc limit #{offset}, #{limit}
</select>
<select id="getPeopleFromIdCount" resultType="java.lang.Integer">
- select
- count(*)
- from (
- select
- a.id
- from t_user_competition a
- left join t_payment_competition b on (a.paymentCompetitionId = b.id)
- where b.state = 1 and b.payStatus != 1 and a.competitionId = #{id}
+ select count(1) from t_user_competition where competitionId = #{id} and paymentCompetitionId in (
+ select id from t_payment_competition where state = 1 and payStatus != 1
<if test="null != state and state == 1">
- and b.payStatus = 2
+ and payStatus = 2
</if>
<if test="null != state and state == 3">
- and b.payStatus = 3
+ and payStatus = 3
</if>
- group by a.id
- ) as aa where aa.id is not null
+ )
</select>
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/CompetitionUser.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/CompetitionUser.java
index 6e43acd..6c0d239 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/CompetitionUser.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/CompetitionUser.java
@@ -1,6 +1,9 @@
package com.dsh.course.feignClient.competition.model;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+
+import java.util.Date;
@Data
public class CompetitionUser {
@@ -11,4 +14,6 @@
private String phone;
private String idCard;
private Integer state;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date insertTime;
}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/login.html b/cloud-server-management/src/main/webapp/WEB-INF/view/login.html
index a90987a..2846a61 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/login.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/login.html
@@ -64,16 +64,16 @@
<form class="m-t" role="form" action="${ctxPath}/login" method="post">
<div class="item">
<img src="${ctxPath}/img/account.png" />
- <input class="itemInput" type="text" name="username" id="username" placeholder="请输入账号" required="" value="admin">
+ <input class="itemInput" type="text" name="username" id="username" placeholder="请输入账号" required="" value="">
</div>
<div class="item">
<img src="${ctxPath}/img/password.png" />
- <input class="itemInput" type="password" name="password" id="password" placeholder="请输入密码" required="" value="123456">
+ <input class="itemInput" type="password" name="password" id="password" placeholder="请输入密码" required="" value="">
</div>
<div class="form-group" style="float: left;">
<div class="col-sm-8" style="padding-left: 0px; padding-right: 0px;">
- <input class="form-control" type="text" name="kaptcha" placeholder="验证码" required="" value="111111">
+ <input class="form-control" type="text" name="kaptcha" placeholder="验证码" required="" value="">
</div>
<div class="col-sm-4" style="padding-left: 0px; padding-right: 0px;">
<img src="${ctxPath}/kaptcha" id="kaptcha" width="90px" height="34px"/>
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetitionUser.js b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetitionUser.js
index 1266f59..45ae474 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetitionUser.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetitionUser.js
@@ -31,6 +31,8 @@
},
{title: '身份证号', field: 'idCard', visible: true, align: 'center', valign: 'middle',width:'8%',
},
+ {title: '报名时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle',width:'8%',
+ },
{title: '状态', field: 'state', visible: true, align: 'center', valign: 'middle',width:'8%',
formatter:function (data) {
return {1:"正常",2:"正常",3:"已取消"}[data]
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/worldCup/registeredPersonnel.js b/cloud-server-management/src/main/webapp/static/modular/system/worldCup/registeredPersonnel.js
index 3266ae7..e2706b9 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/worldCup/registeredPersonnel.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/worldCup/registeredPersonnel.js
@@ -24,6 +24,7 @@
return '<a href="#" onclick="RegisteredPersonnel.openQRCode(' + item.id + ', ' + item.isStudent + ',\'' + item.name + '\')" style="color:blue;">查看</a>'
}
},
+ {title: '报名时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle'},
{title: '状态', field: 'state', visible: true, align: 'center', valign: 'middle',
formatter:function (data) {
return {1:"正常",2:"已取消"}[data]
--
Gitblit v1.7.1