renkang/zhst-finance-model
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新功能及bug修改

Browse Source
This commit is contained in:
hejiayang
2025-12-06 20:48:38 +08:00
parent 4614ed1f19
commit 84f5eaad9b
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StClientMemberTransactionRecordMapper.xml
+10 -14
View File
@@ -38,7 +38,7 @@
a.id, a.id,
a.serial_no as serialNo, a.serial_no as serialNo,
a.order_no as orderNo, a.order_no as orderNo,
c.realname as userName, IF(a.member_id = a.pay_member_id,c.realname,CONCAT(c.realname,'-',pay.realname)) as userName,
sboi.serial_no as cardCode, sboi.serial_no as cardCode,
sboi.business_model AS businessModel, sboi.business_model AS businessModel,
pay.realname as payUserName, pay.realname as payUserName,
@@ -67,8 +67,8 @@
LEFT JOIN st_client_member_balance AS b ON a.member_id = b.member_id LEFT JOIN st_client_member_balance AS b ON a.member_id = b.member_id
LEFT JOIN st_bbzx_order_info AS sboi ON sboi.order_no = a.order_no LEFT JOIN st_bbzx_order_info AS sboi ON sboi.order_no = a.order_no
LEFT JOIN st_base_restaurant AS br ON br.id = a.canteen_id LEFT JOIN st_base_restaurant AS br ON br.id = a.canteen_id
LEFT JOIN sys_user_sub AS c ON a.member_id = c.id LEFT JOIN sys_user_sub AS c ON a.pay_member_id = c.id
LEFT JOIN sys_user_sub AS pay ON a.pay_member_id = pay.id LEFT JOIN sys_user_sub AS pay ON a.member_id = pay.id
LEFT JOIN sys_pay_depart direct_depart ON pay.depart_ids = direct_depart.id AND direct_depart.del_flag = '0' LEFT JOIN sys_pay_depart direct_depart ON pay.depart_ids = direct_depart.id AND direct_depart.del_flag = '0'
LEFT JOIN sys_pay_depart parent_depart ON direct_depart.parent_id = parent_depart.id AND parent_depart.del_flag = '0' LEFT JOIN sys_pay_depart parent_depart ON direct_depart.parent_id = parent_depart.id AND parent_depart.del_flag = '0'
WHERE a.is_del = 0 WHERE a.is_del = 0
@@ -140,8 +140,8 @@
<if test="vo.dinnerType != null and vo.dinnerType != ''"> <if test="vo.dinnerType != null and vo.dinnerType != ''">
LEFT JOIN st_bbzx_order_info sboi ON a.order_no = sboi.order_no LEFT JOIN st_bbzx_order_info sboi ON a.order_no = sboi.order_no
</if> </if>
LEFT JOIN sys_user_sub AS c ON a.member_id = c.id LEFT JOIN sys_user_sub AS c ON a.pay_member_id = c.id
LEFT JOIN sys_user_sub AS pay ON a.pay_member_id = pay.id LEFT JOIN sys_user_sub AS pay ON a.member_id = pay.id
WHERE a.is_del = 0 WHERE a.is_del = 0
<if test="vo.startTime != null and vo.endTime !=''"> <if test="vo.startTime != null and vo.endTime !=''">
<choose> <choose>
@@ -176,9 +176,7 @@
and c.work_no like CONCAT('%',#{vo.workNo,jdbcType=VARCHAR},'%') and c.work_no like CONCAT('%',#{vo.workNo,jdbcType=VARCHAR},'%')
</if> </if>
<if test="vo.userName != null and vo.userName != ''"> <if test="vo.userName != null and vo.userName != ''">
and (c.realname like CONCAT('%',#{vo.userName,jdbcType=VARCHAR},'%') or and c.realname like CONCAT('%',#{vo.userName,jdbcType=VARCHAR},'%')
pay.realname like CONCAT('%',#{vo.userName,jdbcType=VARCHAR},'%')
)
</if> </if>
<if test="vo.canteenId != null and vo.canteenId != ''"> <if test="vo.canteenId != null and vo.canteenId != ''">
and a.canteen_id = #{vo.canteenId} and a.canteen_id = #{vo.canteenId}
@@ -194,7 +192,7 @@
a.id, a.id,
a.serial_no as serialNo, a.serial_no as serialNo,
a.order_no as orderNo, a.order_no as orderNo,
IF(a.member_id = a.pay_member_id,pay.realname,CONCAT(pay.realname,'-',c.realname)) as userName, IF(a.member_id = a.pay_member_id,c.realname,CONCAT(c.realname,'-',pay.realname)) as userName,
c.phone, c.phone,
c.work_no as workNo, c.work_no as workNo,
a.status, a.status,
@@ -212,8 +210,8 @@
<if test="vo.dinnerType != null and vo.dinnerType != ''"> <if test="vo.dinnerType != null and vo.dinnerType != ''">
LEFT JOIN st_bbzx_order_info sboi ON a.order_no = sboi.order_no LEFT JOIN st_bbzx_order_info sboi ON a.order_no = sboi.order_no
</if> </if>
LEFT JOIN sys_user_sub AS c ON a.member_id = c.id LEFT JOIN sys_user_sub AS c ON a.pay_member_id = c.id
LEFT JOIN sys_user_sub AS pay ON a.pay_member_id = pay.id LEFT JOIN sys_user_sub AS pay ON a.member_id = pay.id
WHERE a.is_del = 0 WHERE a.is_del = 0
<if test="vo.startTime != null and vo.endTime !=''"> <if test="vo.startTime != null and vo.endTime !=''">
<choose> <choose>
@@ -248,9 +246,7 @@
and c.work_no like CONCAT('%',#{vo.workNo,jdbcType=VARCHAR},'%') and c.work_no like CONCAT('%',#{vo.workNo,jdbcType=VARCHAR},'%')
</if> </if>
<if test="vo.userName != null and vo.userName != ''"> <if test="vo.userName != null and vo.userName != ''">
and (c.realname like CONCAT('%',#{vo.userName,jdbcType=VARCHAR},'%') or and c.realname like CONCAT('%',#{vo.userName,jdbcType=VARCHAR},'%')
pay.realname like CONCAT('%',#{vo.userName,jdbcType=VARCHAR},'%')
)
</if> </if>
<if test="vo.canteenId != null and vo.canteenId != ''"> <if test="vo.canteenId != null and vo.canteenId != ''">
and a.canteen_id = #{vo.canteenId} and a.canteen_id = #{vo.canteenId}