yumeng 2 éve
szülő
commit
c40b1fa1e8

+ 3 - 3
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/mapper/xml/IntranetSettlementMapper.xml

@@ -44,7 +44,7 @@
                 FROM
                     (
                         SELECT
-                            account_id AS accountIdF,
+                            advertiser_id AS accountIdF,
                             daily_charge as flowDailyCharge,
                             date_format(date,'%Y%m%d') as 'date',
                             daily_transfer_in as dailyTransferIn,
@@ -54,9 +54,9 @@
                             contract_rebate_real_recharged as contractRebateRealRecharged,
                             direct_rebate_real_recharged as directRebateRealRecharged
                         FROM
-                            `jeecg-boot`.ctop_kuaishou_daily_flows
+                            `application`.kuaishou_advertiser_fund_daily_flows
                         WHERE
-                            account_id = #{accountId}
+                            advertiser_id = #{accountId}
                     ) t
                         LEFT JOIN `jeecg-boot`.ctop_user_allocation c ON t.accountIdF = c.account_id
                         LEFT JOIN `jeecg-boot`.ctop_kuaishou_advertiser_base_info base ON base.account_id = t.accountIdF

+ 9 - 9
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/mapper/xml/ReportSettlementMapper.xml

@@ -181,15 +181,15 @@
             resultType="org.jeecg.ctop.finance.settlement.entity.vo.SettlementReportKuaiShouVo">
         select t.*,c.auth_name as accountName,
                base.user_id as ksId from (select id,
-                                                           account_id,
+                                                           advertiser_id,
                                                         date,DATE_FORMAT(date,'%Y-%m') as uploadYears,
                                                         daily_charge,real_charged,contract_rebate_real_charged,direct_rebate_real_charged,
                                                         daily_transfer_in,daily_transfer_out,balance,
                                                         real_recharged,contract_rebate_real_recharged,direct_rebate_real_recharged,
                                                       create_time
                                                     from
-                                                        ctop_kuaishou_daily_flows
-                                                    where account_id = #{accountId}
+                                                        `application`.kuaishou_advertiser_fund_daily_flows
+                                                    where advertiser_id = #{accountId}
                                                    )t
                                                        LEFT JOIN ctop_user_allocation c on t.account_id = c.account_id
                                                        LEFT JOIN ctop_kuaishou_advertiser_base_info base on base.account_id = t.account_id
@@ -266,7 +266,7 @@
                 FROM
                     (
                         SELECT
-                            account_id AS accountIdF,
+                            advertiser_id AS accountIdF,
                             date,
                             daily_transfer_in as dailyTransferIn,
                             daily_transfer_out as dailyTransferOut,
@@ -275,9 +275,9 @@
                             contract_rebate_real_recharged as contractRebateRealRecharged,
                             direct_rebate_real_recharged as directRebateRealRecharged
                         FROM
-                            ctop_kuaishou_daily_flows
+                           `application`.kuaishou_advertiser_fund_daily_flows
                         WHERE
-                            account_id = #{accountId}
+                            advertiser_id = #{accountId}
                     ) t
                         LEFT JOIN ctop_user_allocation c ON t.accountIdF = c.account_id
                         LEFT JOIN ctop_kuaishou_advertiser_base_info base ON base.account_id = t.accountIdF
@@ -715,7 +715,7 @@
                 FROM
                     (
                         SELECT
-                            account_id AS accountIdF,
+                            advertiser_id AS accountIdF,
                              daily_charge as flowDailyCharge,
                             date,
                             daily_transfer_in as dailyTransferIn,
@@ -725,9 +725,9 @@
                             contract_rebate_real_recharged as contractRebateRealRecharged,
                             direct_rebate_real_recharged as directRebateRealRecharged
                         FROM
-                            ctop_kuaishou_daily_flows
+                             `application`.kuaishou_advertiser_fund_daily_flows
                         WHERE
-                            account_id = #{accountId}
+                            advertiser_id = #{accountId}
                     ) t
                         LEFT JOIN ctop_user_allocation c ON t.accountIdF = c.account_id
                         LEFT JOIN ctop_kuaishou_advertiser_base_info base ON base.account_id = t.accountIdF