Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
7df00e5adc
|
|
@ -416,8 +416,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
SUM( CASE WHEN wallet_id = 1 THEN wallet_bal ELSE 0 END ) AS walletBal,
|
SUM( CASE WHEN wallet_id = 1 THEN wallet_bal ELSE 0 END ) AS walletBal,
|
||||||
SUM( CASE WHEN wallet_id = 2 THEN wallet_bal ELSE 0 END ) AS subsidyBal,
|
SUM( CASE WHEN wallet_id = 2 THEN wallet_bal ELSE 0 END ) AS subsidyBal,
|
||||||
SUM( a.wallet_bal ) AS accAvailableBal,
|
SUM( a.wallet_bal ) AS accAvailableBal,
|
||||||
SUM( a.frozen_balance ) AS accFreezeBalTotal,
|
SUM( ifnull(a.frozen_balance, 0) ) AS accFreezeBalTotal,
|
||||||
SUM( a.wallet_bal ) + SUM( a.frozen_balance ) AS accBalTotal
|
SUM( a.wallet_bal ) + SUM( ifnull(a.frozen_balance, 0) ) AS accBalTotal
|
||||||
FROM acc_wallet_info a
|
FROM acc_wallet_info a
|
||||||
GROUP BY user_id
|
GROUP BY user_id
|
||||||
) AS t4 ON t4.user_id = t1.user_id
|
) AS t4 ON t4.user_id = t1.user_id
|
||||||
|
|
@ -460,7 +460,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
user_id,
|
user_id,
|
||||||
SUM( CASE WHEN wallet_id = 1 THEN wallet_bal ELSE 0 END ) AS walletBal,
|
SUM( CASE WHEN wallet_id = 1 THEN wallet_bal ELSE 0 END ) AS walletBal,
|
||||||
SUM( CASE WHEN wallet_id = 2 THEN wallet_bal ELSE 0 END ) AS subsidyBal,
|
SUM( CASE WHEN wallet_id = 2 THEN wallet_bal ELSE 0 END ) AS subsidyBal,
|
||||||
SUM( a.wallet_bal ) + SUM( a.frozen_balance ) accBalTotal
|
SUM( a.wallet_bal ) + SUM( ifnull(a.frozen_balance, 0) ) accBalTotal
|
||||||
FROM
|
FROM
|
||||||
acc_wallet_info a
|
acc_wallet_info a
|
||||||
GROUP BY
|
GROUP BY
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue