|
|
@@ -96,7 +96,7 @@ public interface CompanyMoneyLogsMapper
|
|
|
",COALESCE(so.order_code, lo.order_code) as order_code " +
|
|
|
",COALESCE(so.user_phone, lo.user_phone) as user_phone " +
|
|
|
",COALESCE(sp.bank_transaction_id, lp.bank_transaction_id) as bank_transaction_id " +
|
|
|
- ",COALESCE(sp.pay_type_code, lp.pay_type_code) as pay_type_code " +
|
|
|
+ ",COALESCE(l.type, lp.pay_type_code) as pay_type_code " +
|
|
|
",COALESCE(sp.pay_code, lp.pay_code) as pay_code " +
|
|
|
"from company_money_logs l " +
|
|
|
"left join company c on c.company_id=l.company_id " +
|
|
|
@@ -142,7 +142,7 @@ public interface CompanyMoneyLogsMapper
|
|
|
@Select({"<script> " +
|
|
|
"select l.*,c.company_name " +
|
|
|
",COALESCE(sp.bank_transaction_id, lp.bank_transaction_id) as bank_transaction_id " +
|
|
|
- ",COALESCE(sp.pay_type_code, lp.pay_type_code) as pay_type_code " +
|
|
|
+ ",COALESCE(l.type, lp.pay_type_code) as pay_type_code " +
|
|
|
"from company_money_logs l left join company c on c.company_id=l.company_id " +
|
|
|
"left join fs_store_payment sp on (sp.payment_id=l.business_id and l.type=0) " +
|
|
|
"left join live_order_payment lp on (lp.payment_id=l.business_id and lp.status=1 and l.type=1) " +
|