commit
This commit is contained in:
+19
-8
@@ -151,18 +151,29 @@ public class MemberPaymentChartSummaryController {
|
||||
Sql sql = Sqls.create("""
|
||||
SELECT
|
||||
un.unionname,
|
||||
COALESCE ( SUM( pt.tradingAmount * 0.01 ), 0 ) AS money
|
||||
COALESCE ( SUM( subquery.money ), 0 ) AS money
|
||||
FROM
|
||||
sys_union un
|
||||
LEFT JOIN payment_transaction pt ON pt.unionId = un.id
|
||||
AND pt.tradingState = 'PAY_SUCCESS'
|
||||
AND pt.isRefund = 0
|
||||
LEFT JOIN member_payment_info mpi ON mpi.id = pt.memberPaymentInfoId
|
||||
AND mpi.paymentProjectId=@paymentProjectId
|
||||
LEFT JOIN (
|
||||
SELECT
|
||||
pt.unionId,
|
||||
SUM( pt.tradingAmount * 0.01 ) AS money
|
||||
FROM
|
||||
payment_transaction pt
|
||||
INNER JOIN member_payment_info mpi ON mpi.id = pt.memberPaymentInfoId
|
||||
AND mpi.paymentProjectId = @paymentProjectId
|
||||
WHERE
|
||||
pt.tradingState = 'PAY_SUCCESS'
|
||||
AND pt.isRefund = 0
|
||||
GROUP BY
|
||||
pt.unionId
|
||||
) subquery ON subquery.unionId = un.id
|
||||
GROUP BY
|
||||
un.id
|
||||
ORDER BY
|
||||
un.id,
|
||||
un.unionname,
|
||||
un.unioncode
|
||||
ORDER BY
|
||||
un.unioncode;
|
||||
""").setParam("paymentProjectId", paymentProjectId);
|
||||
return Result.success(memberPaymentService.listMap(sql));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user