消费统计时间来源调整

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/emp/mapper/xml/CqBaseEmployeeMapper.xml

@@ -573,11 +573,10 @@
             SELECT
             member_id,
             top_up_balance,
-            reward_balance,
-            (top_up_balance + reward_balance) AS balance
-            FROM
-            st_client_member_balance
-            WHERE
+            reward_balance
+            FROM st_client_member_balance
+            WHERE member_id IN (SELECT id FROM sys_user_sub WHERE update_time > FROM_UNIXTIME(#{timestamp}/1000))
+            OR
             create_time > FROM_UNIXTIME(#{timestamp} / 1000)
             OR update_time > FROM_UNIXTIME(#{timestamp} / 1000)
             OR last_consumption_time > FROM_UNIXTIME(#{timestamp} / 1000)

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StBbzxOrderInfoMapper.xml

@@ -243,7 +243,7 @@
             </foreach>
         </if>
         <if test="startDate != '' and startDate != null ">
-            and eat_day between #{startDate} and #{endDate}
+            and DATE_FORMAT(create_time,'%Y-%m-%d') between #{startDate} and #{endDate}
         </if>
         ) AS totalNum
         FROM
@@ -259,7 +259,7 @@
             </foreach>
         </if>
         <if test="startDate != '' and startDate != null ">
-            and oi.eat_day between #{startDate} and  #{endDate}
+            and DATE_FORMAT(oi.create_time,'%Y-%m-%d') between #{startDate} and  #{endDate}
         </if>
         GROUP BY
         oi.canteen_id,

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StClientMemberTransactionRecordMapper.xml

@@ -135,7 +135,15 @@
                 #{canteenId}
             </foreach>
         </if>
-        order by a.create_time desc
+        order by a.create_time
+         <choose>
+             <when test="vo.status != null and vo.status == 3 ">
+                 asc
+             </when>
+              <otherwise>
+                  desc
+              </otherwise>
+         </choose>
     </select>
 
     <select id="pageListCount" resultType="java.lang.Long">