zm/nuttyreading-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微信支付回调 回扫去掉退款和退款中状态的修改，报表统计修改

Browse Source
This commit is contained in:
wyn
2026-07-03 17:06:18 +08:00
parent a8507deb2e
commit e1ff7d4b9e
7 changed files with 87 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/resources/mapper/master/UserVipLogDao.xml
View File

@@ -15,10 +15,12 @@
IF(DATE_FORMAT(uvl.start_time, '%Y-%m') > SUBSTR(#{date},1,7),0,IF(DATE_FORMAT(uvl.end_time, '%Y-%m') < SUBSTR(#{date},1,7),0,IF(DATE_FORMAT(uvl.end_time, '%Y-%m') > SUBSTR(#{date},1,7),if(DATE_FORMAT(uvl.start_time, '%Y-%m') = SUBSTR(#{date},1,7),DATEDIFF(#{date},uvl.start_time)+1,DAY(#{date})),DATEDIFF(uvl.end_time,concat(SUBSTR(#{date},1,7),'-01'))+1))) currentDays,
IF(DATE_FORMAT(uvl.start_time, '%Y-%m') > SUBSTR(#{date},1,7),DATEDIFF(uvl.end_time,uvl.start_time)+1,(IF(DATE_FORMAT(uvl.end_time, '%Y-%m') <= SUBSTR(#{date},1,7),0,DATEDIFF(uvl.end_time,#{date})))) notyetDays
from user_vip_log uvl LEFT JOIN buy_order a ON a.order_sn=uvl.order_sn
LEFT JOIN buy_order_refund b ON a.order_id=b.order_id
left join user_vip uv on uv.id = uvl.user_vip_id
left join user u on u.id = uvl.user_id
left join pay_zfb_order pzo on pzo.relevanceOid = uvl.order_sn and pzo.trade_no is not null
where u.del_flag = 0 and (uvl.del_flag = 0 or (uvl.del_flag = -1 and a.order_status=6))
and (DATE_FORMAT(b.create_time, '%Y-%m')>=SUBSTR(#{date},1,7) || ISNULL(b.create_time))
AND (uv.del_flag = 0 OR (uv.del_flag = -1 AND a.order_status=6))
and DATE_FORMAT(IF(uvl.pay_time is NULL,uvl.start_time,uvl.pay_time), '%Y-%m') <= SUBSTR(#{date},1,7)
and
@@ -264,7 +266,8 @@
left join user_vip uv on uv.id = uvl.user_vip_id
left join user u on u.id = uvl.user_id
left join pay_zfb_order pzo on pzo.relevanceOid = uvl.order_sn and pzo.trade_no is not null
where u.del_flag = 0 and uvl.del_flag = 0 and uv.del_flag = 0 and DATE_FORMAT(IF(uvl.pay_time is NULL,uvl.start_time,uvl.pay_time), '%Y-%m') <= SUBSTR(#{date},1,7) and u.id not in (select id from user where tester_flag = 1)
where u.del_flag = 0 and uvl.del_flag = 0 and uv.del_flag = 0 and DATE_FORMAT(IF(uvl.pay_time is NULL,uvl.start_time,uvl.pay_time), '%Y-%m') <= SUBSTR(#{date},1,7)
and (u.id not in (select id from user where tester_flag = 1) or (u.id in (select id from user where tester_flag = 1) and (uvl.pay_type in('微信','支付宝') and uvl.create_time>='2026-05-06 00:00:00')))
order by uvl.end_time asc
) t order by currentDays desc
) s
@@ -299,7 +302,7 @@
</select>
<select id="getUserVipRefundFeeTotal" resultType="java.math.BigDecimal">
select IFNULL(SUM(c.fee),0)
select IFNULL(SUM(uvl.price),0)
from user_vip_log uvl
left join user_vip uv on uv.id = uvl.user_vip_id
left join user u on u.id = uvl.user_id