From 7fe6d026bcc8f993ce76437d01607e591cc671fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 25 十一月 2023 17:20:02 +0800
Subject: [PATCH] 重写课包支付和排课逻辑

---
 cloud-server-account/src/main/resources/mapper/TAppUserMapper.xml |   67 ++++++++++++++++-----------------
 1 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/cloud-server-account/src/main/resources/mapper/TAppUserMapper.xml b/cloud-server-account/src/main/resources/mapper/TAppUserMapper.xml
index 67c9d60..7bd94c7 100644
--- a/cloud-server-account/src/main/resources/mapper/TAppUserMapper.xml
+++ b/cloud-server-account/src/main/resources/mapper/TAppUserMapper.xml
@@ -4,33 +4,32 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.dsh.account.entity.TAppUser">
-        <id column="id" property="id" />
-        <result column="code" property="code" />
-        <result column="name" property="name" />
-        <result column="phone" property="phone" />
-        <result column="password" property="password" />
-        <result column="birthday" property="birthday" />
-        <result column="gender" property="gender" />
-        <result column="height" property="height" />
-        <result column="weight" property="weight" />
-        <result column="bmi" property="bmi" />
-        <result column="idCard" property="idCard" />
-        <result column="openid" property="openid" />
-        <result column="province" property="province" />
-        <result column="provinceCode" property="provinceCode" />
-        <result column="city" property="city" />
-        <result column="cityCode" property="cityCode" />
-        <result column="isVip" property="isVip" />
-        <result column="vipEndTime" property="vipEndTime" />
-        <result column="viplevelId" property="viplevelId" />
-        <result column="referralUserId" property="referralUserId" />
-        <result column="salesmanUserId" property="salesmanUserId" />
-        <result column="state" property="state" />
-        <result column="integral" property="integral" />
-        <result column="playPaiCoins" property="playPaiCoins" />
-        <result column="headImg" property="headImg" />
+        <id column="id" property="id"/>
+        <result column="code" property="code"/>
+        <result column="name" property="name"/>
+        <result column="phone" property="phone"/>
+        <result column="password" property="password"/>
+        <result column="birthday" property="birthday"/>
+        <result column="gender" property="gender"/>
+        <result column="height" property="height"/>
+        <result column="weight" property="weight"/>
+        <result column="bmi" property="bmi"/>
+        <result column="idCard" property="idCard"/>
+        <result column="openid" property="openid"/>
+        <result column="province" property="province"/>
+        <result column="provinceCode" property="provinceCode"/>
+        <result column="city" property="city"/>
+        <result column="cityCode" property="cityCode"/>
+        <result column="isVip" property="isVip"/>
+        <result column="vipEndTime" property="vipEndTime"/>
+        <result column="viplevelId" property="viplevelId"/>
+        <result column="referralUserId" property="referralUserId"/>
+        <result column="salesmanUserId" property="salesmanUserId"/>
+        <result column="state" property="state"/>
+        <result column="integral" property="integral"/>
+        <result column="playPaiCoins" property="playPaiCoins"/>
+        <result column="headImg" property="headImg"/>
     </resultMap>
-
 
 
     <update id="membershipEnd">
@@ -101,7 +100,7 @@
 
 
     <select id="getYearUserCount" resultType="com.dsh.account.vo.entity.YearData">
-        select IFNULL(count(*),0) AS yearCount,DATE_FORMAT(insertTime,'%Y') AS `year`  from t_app_user
+        select IFNULL(count(*),0) AS yearCount,DATE_FORMAT(insertTime,'%Y') AS `year` from t_app_user
         <where>
             <if test="dto.cityCode != null and dto.cityCode != ''">
                 AND cityCode = #{dto.cityCode}
@@ -121,7 +120,7 @@
         GROUP BY DATE_FORMAT(insertTime,'%Y')
     </select>
     <select id="getMonthUserCount" resultType="com.dsh.account.vo.entity.MonthData">
-        select IFNULL(count(*),0) AS monthCount,DATE_FORMAT(insertTime,'%Y%m') AS `month`  from t_app_user
+        select IFNULL(count(*),0) AS monthCount,DATE_FORMAT(insertTime,'%Y%m') AS `month` from t_app_user
         <where>
             <if test="dto.cityCode != null and dto.cityCode != ''">
                 AND cityCode = #{dto.cityCode}
@@ -141,7 +140,7 @@
         GROUP BY DATE_FORMAT(insertTime,'%Y%m')
     </select>
     <select id="getWeekUserCount4" resultType="com.dsh.account.vo.entity.WeekData">
-        select IFNULL(count(*),0) AS weekCount,4 AS `week`  from t_app_user
+        select IFNULL(count(*),0) AS weekCount,4 AS `week` from t_app_user
         <where>
             <if test="dto.startTime != null and dto.startTime != '' and dto.endTime != null and dto.endTime != ''">
                 AND insertTime between #{dto.startTime} and #{dto.endTime}
@@ -164,7 +163,7 @@
     </select>
 
     <select id="getWeekUserCount3" resultType="com.dsh.account.vo.entity.WeekData">
-        select IFNULL(count(*),0) AS weekCount,3 AS `week`  from t_app_user
+        select IFNULL(count(*),0) AS weekCount,3 AS `week` from t_app_user
         <where>
             <if test="dto.startTime != null and dto.startTime != '' and dto.endTime != null and dto.endTime != ''">
                 AND insertTime between #{dto.startTime} and #{dto.endTime}
@@ -187,7 +186,7 @@
     </select>
 
     <select id="getWeekUserCount2" resultType="com.dsh.account.vo.entity.WeekData">
-        select IFNULL(count(*),0) AS weekCount,2 AS `week`  from t_app_user
+        select IFNULL(count(*),0) AS weekCount,2 AS `week` from t_app_user
         <where>
             <if test="dto.startTime != null and dto.startTime != '' and dto.endTime != null and dto.endTime != ''">
                 AND insertTime between #{dto.startTime} and #{dto.endTime}
@@ -210,7 +209,7 @@
     </select>
 
     <select id="getWeekUserCount1" resultType="com.dsh.account.vo.entity.WeekData">
-        select IFNULL(count(*),0) AS weekCount,1 AS `week`  from t_app_user
+        select IFNULL(count(*),0) AS weekCount,1 AS `week` from t_app_user
         <where>
             <if test="dto.startTime != null and dto.startTime != '' and dto.endTime != null and dto.endTime != ''">
                 AND insertTime between #{dto.startTime} and #{dto.endTime}
@@ -233,7 +232,7 @@
     </select>
 
     <select id="getDayUserCount" resultType="com.dsh.account.vo.entity.DayData">
-        select IFNULL(count(*),0) AS dayCount,DATE_FORMAT(insertTime,'%Y-%m-%d') AS `day`  from t_app_user
+        select IFNULL(count(*),0) AS dayCount,DATE_FORMAT(insertTime,'%Y-%m-%d') AS `day` from t_app_user
         <where>
             <if test="dto.startTime != null and dto.startTime != '' and dto.endTime != null and dto.endTime != ''">
                 AND insertTime between #{dto.startTime} and #{dto.endTime}
@@ -256,7 +255,7 @@
         GROUP BY DATE_FORMAT(insertTime,'%Y-%m-%d')
     </select>
     <select id="groupCityInfo" resultType="com.dsh.account.vo.GroupCityInfoVO">
-        select IFNULL(count(*),0) AS userCount,cityCode,city  from t_app_user
+        select IFNULL(count(*),0) AS userCount,cityCode,city from t_app_user
         <where>
             <if test="dto.startTime != null and dto.startTime != '' and dto.endTime != null and dto.endTime != ''">
                 AND insertTime between #{dto.startTime} and #{dto.endTime}

--
Gitblit v1.7.1