From 2fed5b176458a3776be9ea39ae9bc52c461ca815 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期六, 28 十月 2023 14:33:59 +0800
Subject: [PATCH] 10.28。1
---
cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml | 4 ++--
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 2 +-
cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml | 3 +--
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java | 12 +++++++++++-
cloud-server-other/src/main/java/com/dsh/other/mapper/SiteBookingMapper.java | 2 +-
5 files changed, 16 insertions(+), 7 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 bdb6234..00455c9 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
@@ -706,8 +706,8 @@
consumeDetail.setConsumeName(RechargeRecordEnum.EVENT_REGISTRATION.getMsg());
consumeDetail.setConsumeTime(paymentCompetition.getTime());
consumeDetail.setConsumeAmount("-" + paymentCompetition.getAmount());
+ consumeDetail.setType(2);
details.add(consumeDetail);
- consumeDetail.setType(1);
}
}
// 2.取消赛事报名
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
index 6315975..d310d4a 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
@@ -163,7 +163,17 @@
competitionInfo.setAge(competition.getStartAge() + "-" + competition.getEndAge());
competitionInfo.setProvince(competition.getEntryProvince());
competitionInfo.setCity(competition.getEntryCity());
- competitionInfo.setAddress(competition.getEntryAddress());
+ String str = competition.getAddress();
+ str = str.substring(str.indexOf("省") + 1);
+
+ // 去掉第一个“市”及之前的字符串
+ str = str.substring(str.indexOf("市") + 1);
+
+ // 去掉第一个“区”及之前的字符串
+ str = str.substring(str.indexOf("区") + 1);
+
+
+ competitionInfo.setAddress(str);
competitionInfo.setCashPrice(competition.getCashPrice());
competitionInfo.setPlayPaiCoin(competition.getPlayPaiCoin());
competitionInfo.setClassPrice(competition.getClassPrice());
diff --git a/cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml b/cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml
index 9d40a34..afed275 100644
--- a/cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml
+++ b/cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml
@@ -37,7 +37,7 @@
SELECT DATE_FORMAT(insertTime, '%m-%d %H:%i')as `time`,
amount
from t_payment_competition
- where payStatus = 2 and payType = 1 and payType = 2
+ where payStatus = 2 and payType in (1,2)
<if test="null != monthStart and '' != monthStart and null != monthEnd and '' != monthEnd">
and DATE_FORMAT(payTime, '%Y-%m-%d %H:%i:%s') between #{monthStart} and #{monthEnd}
</if>
@@ -49,7 +49,7 @@
SELECT DATE_FORMAT(insertTime, '%m-%d %H:%i')as `time`,
amount
from t_payment_competition
- where payStatus = 3 and payType = 1 and payType = 2
+ where payStatus = 3 and payType in (1,2)
<if test="null != monthStart and '' != monthStart and null != monthEnd and '' != monthEnd">
and DATE_FORMAT(refundTime, '%Y-%m-%d %H:%i:%s') between #{monthStart} and #{monthEnd}
</if>
diff --git a/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml b/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml
index da4b78a..0daff8f 100644
--- a/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml
+++ b/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml
@@ -50,8 +50,7 @@
</select>
<select id="billingDataRequestVo" resultType="com.dsh.course.model.BillingRequest">
- SELECT DATE_FORMAT(payTime, '%m-%d %H:%i')as `time`,
- amount
+ SELECT DATE_FORMAT(insertTime, '%m-%d %H:%i')as `time`,IFNULL(playPaiCoin, cashPayment) AS amount
from t_course_package_payment
where payStatus = 2 and state = 1 and payType = 3
<if test="null != monthStart and '' != monthStart and null != monthEnd and '' != monthEnd">
diff --git a/cloud-server-other/src/main/java/com/dsh/other/mapper/SiteBookingMapper.java b/cloud-server-other/src/main/java/com/dsh/other/mapper/SiteBookingMapper.java
index f5244ef..8a3ef81 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/mapper/SiteBookingMapper.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/mapper/SiteBookingMapper.java
@@ -14,7 +14,7 @@
* @date 2023/7/13 16:48
*/
public interface SiteBookingMapper extends BaseMapper<SiteBooking> {
- List<BillingRequestOfType> queryDatas(Integer appUserId, String monthStart, String monthEnd);
+ List<BillingRequestOfType> queryDatas(@Param("appUserId")Integer appUserId,@Param("monthStart") String monthStart,@Param("monthEnd") String monthEnd);
List<SiteBooking> listAll(@Param("query")SiteBookingQuery query, @Param("sTime")String sTime, @Param("eTime")String eTime, @Param("amount") BigDecimal amount);
--
Gitblit v1.7.1