xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/fin' into develop

Browse Source
This commit is contained in:
WIN-C27C5MSVTPO\16961
2025-10-30 18:37:46 +08:00
parent 5f25ac9895 72fa638cf5
commit 2e85b46a3d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/common/service/FinPaymentApplyService.php
+5 -5
View File
@@ -233,12 +233,12 @@ class FinPaymentApplyService
} }
if (!empty($remitter)) { if (!empty($remitter)) {
$similarityOrder[] = "CASE WHEN remitter = {$remitter} THEN 0 ELSE 1 END"; $similarityOrder[] = "CASE WHEN remitter = '{$remitter}' THEN 0 ELSE 1 END";
} }
if (!empty($amount)) { if (!empty($amount)) {
$amount = (float)$amount; $amount = (float)$amount;
$similarityOrder[] = "ABS(amount - {$amount}) ASC"; $similarityOrder[] = "ABS(amount - {$amount})";
$similarityOrder[] = "CASE WHEN (ABS(amount - {$amount}) / {$amount} * 100) <= 5 THEN 0 ELSE 1 END"; $similarityOrder[] = "CASE WHEN (ABS(amount - {$amount}) / {$amount} * 100) <= 5 THEN 0 ELSE 1 END";
} }
@@ -252,9 +252,9 @@ class FinPaymentApplyService
END ASC, "; END ASC, ";
} }
$orderByClause .= "CASE $orderByClause .= "CASE
WHEN created_at > {$sevenDaysAgo} THEN id WHEN created_at > {$sevenDaysAgo} THEN id
ELSE 999999 ELSE 999999
END DESC, "; END DESC, ";
$orderByClause .= "id DESC"; $orderByClause .= "id DESC";