|
@@ -177,7 +177,7 @@ public interface FsStoreOrderItemScrmMapper
|
|
|
"left join company_user cu on cu.user_id=o.company_user_id " +
|
|
"left join company_user cu on cu.user_id=o.company_user_id " +
|
|
|
"left join company_tcm_schedule cts on cts.id = o.schedule_id " +
|
|
"left join company_tcm_schedule cts on cts.id = o.schedule_id " +
|
|
|
"LEFT JOIN fs_store_order_df df on df.order_id=o.id\n" +
|
|
"LEFT JOIN fs_store_order_df df on df.order_id=o.id\n" +
|
|
|
- " <if test=\"maps.appId !=null and maps.appId!=''\">\n" +
|
|
|
|
|
|
|
+ "<if test=\"(maps.appId !=null and maps.appId!='') or (maps.bankTransactionId !=null and maps.bankTransactionId!='') \">\n" +
|
|
|
" LEFT JOIN (\n" +
|
|
" LEFT JOIN (\n" +
|
|
|
" SELECT\n" +
|
|
" SELECT\n" +
|
|
|
" sp.*,\n" +
|
|
" sp.*,\n" +
|
|
@@ -185,10 +185,10 @@ public interface FsStoreOrderItemScrmMapper
|
|
|
" FROM fs_store_payment_scrm sp\n" +
|
|
" FROM fs_store_payment_scrm sp\n" +
|
|
|
" WHERE sp.business_code IS NOT NULL\n" +
|
|
" WHERE sp.business_code IS NOT NULL\n" +
|
|
|
" ) sp_latest ON sp_latest.business_code = o.order_code AND sp_latest.rn = 1\n" +
|
|
" ) sp_latest ON sp_latest.business_code = o.order_code AND sp_latest.rn = 1\n" +
|
|
|
- "<if test=\"maps.appId != null and maps.appId != ''\">" +
|
|
|
|
|
- " LEFT JOIN fs_course_play_source_config csc ON csc.appid = sp_latest.app_id\n" +
|
|
|
|
|
- "</if>" +
|
|
|
|
|
- " </if>" +
|
|
|
|
|
|
|
+ "<if test=\"maps.appId != null and maps.appId != ''\">" +
|
|
|
|
|
+ " LEFT JOIN fs_course_play_source_config csc ON csc.appid = sp_latest.app_id\n" +
|
|
|
|
|
+ "</if>" +
|
|
|
|
|
+ "</if>" +
|
|
|
"where 1=1 " +
|
|
"where 1=1 " +
|
|
|
"<if test=\"maps.bankTransactionId !=null and maps.bankTransactionId!=''\">" +
|
|
"<if test=\"maps.bankTransactionId !=null and maps.bankTransactionId!=''\">" +
|
|
|
"and sp_latest.bank_transaction_id = #{maps.bankTransactionId}\n" +
|
|
"and sp_latest.bank_transaction_id = #{maps.bankTransactionId}\n" +
|