|
@@ -10,10 +10,42 @@
|
|
|
balance,cash_cost,cost,frozen,income,reward_cost,shared_wallet_cost,transfer_in,transfer_out,create_time
|
|
|
from
|
|
|
ctop_account_transaction_day
|
|
|
- where advertiser_id = #{accountId}
|
|
|
+ where cost >0
|
|
|
+ and advertiser_id = #{accountId}
|
|
|
)t
|
|
|
LEFT JOIN ctop_user_allocation c on t.advertiser_id = c.account_id
|
|
|
where uploadYears = #{uploadYears}
|
|
|
+
|
|
|
+ /* 账户流水信息 修改---------
|
|
|
+ SELECT
|
|
|
+ t.*,
|
|
|
+ IFNULL((SELECT c.auth_name from ctop_user_allocation c where t.advertiser_id = c.account_id ),(SELECT c.account_name from ctop_cwjs_settlement_info c where t.advertiser_id = c.account_id )) as accountName
|
|
|
+ FROM
|
|
|
+ (
|
|
|
+ SELECT
|
|
|
+ id,
|
|
|
+ advertiser_id,
|
|
|
+ date,
|
|
|
+ DATE_FORMAT( date, '%Y-%m' ) AS uploadYears,
|
|
|
+ balance,
|
|
|
+ cash_cost,
|
|
|
+ cost,
|
|
|
+ frozen,
|
|
|
+ income,
|
|
|
+ reward_cost,
|
|
|
+ shared_wallet_cost,
|
|
|
+ transfer_in,
|
|
|
+ transfer_out,
|
|
|
+ create_time
|
|
|
+ FROM
|
|
|
+ ctop_account_transaction_day
|
|
|
+ WHERE cash_cost >0
|
|
|
+ and advertiser_id = #{accountId}
|
|
|
+ ) t
|
|
|
+ WHERE
|
|
|
+ uploadYears = #{uploadYears}
|
|
|
+ ORDER BY date
|
|
|
+ limit 31*/
|
|
|
</select>
|
|
|
|
|
|
<!-- 查询 头条 账户id-->
|
|
@@ -32,6 +64,14 @@
|
|
|
<if test="mediaId !=null and mediaId != ''">
|
|
|
AND media_id = #{mediaId}
|
|
|
</if>
|
|
|
+ <if test="sales !=null and sales != ''">
|
|
|
+ AND create_user_id in
|
|
|
+ <foreach collection="sales" item="item" separator=","
|
|
|
+ open="(" close=")">
|
|
|
+ #{item}
|
|
|
+ </foreach>
|
|
|
+ </if>
|
|
|
+
|
|
|
</select>
|
|
|
|
|
|
<!-- 查询 头条 账户 图片-->
|
|
@@ -115,7 +155,8 @@
|
|
|
FROM
|
|
|
ctop_kuaishou_daily_agent
|
|
|
WHERE
|
|
|
- account_id = #{accountId}
|
|
|
+ and total_charged_in_yuan >0
|
|
|
+ and account_id = #{accountId}
|
|
|
) t
|
|
|
WHERE
|
|
|
DATE_FORMAT( t.date, '%Y-%m' ) = #{uploadYears}
|