7253-devToTest_2418 #2350

Merged
alexm merged 320 commits from 7253-devToTest_2418 into test 2024-04-23 08:02:46 +00:00
1 changed files with 21 additions and 21 deletions
Showing only changes of commit c6ece4619f - Show all commits

View File

@ -17,27 +17,27 @@ BEGIN
DROP TEMPORARY TABLE IF EXISTS tCreditClients; DROP TEMPORARY TABLE IF EXISTS tCreditClients;
CREATE TEMPORARY TABLE tCreditClients CREATE TEMPORARY TABLE tCreditClients
SELECT clientFk, IF(credit > recovery, credit - recovery, 0) newCredit SELECT clientFk, IF(credit > recovery, credit - recovery, 0) newCredit
FROM ( FROM (
SELECT r.clientFk, SELECT r.clientFk,
r.amount recovery, r.amount recovery,
(sub2.created + INTERVAL r.period DAY) deadLine, (sub2.created + INTERVAL r.period DAY) deadLine,
sub2.amount credit sub2.amount credit
FROM recovery r FROM recovery r
JOIN ( JOIN (
SELECT clientFk, amount, created SELECT clientFk, amount, created
FROM ( FROM (
SELECT clientFk, amount, created SELECT clientFk, amount, created
FROM clientCredit FROM clientCredit
ORDER BY created DESC ORDER BY created DESC
LIMIT 10000000000000000000 LIMIT 10000000000000000000
) sub ) sub
GROUP BY clientFk GROUP BY clientFk
) sub2 ON sub2.clientFk = r.clientFk ) sub2 ON sub2.clientFk = r.clientFk
WHERE r.finished IS NULL OR r.finished >= util.VN_CURDATE() WHERE r.finished IS NULL OR r.finished >= util.VN_CURDATE()
GROUP BY r.clientFk GROUP BY r.clientFk
HAVING deadLine <= util.VN_CURDATE() HAVING deadLine <= util.VN_CURDATE()
) sub3 ) sub3
WHERE credit > 0; WHERE credit > 0;
UPDATE client c UPDATE client c
JOIN tCreditClients cc ON cc.clientFk = c.id JOIN tCreditClients cc ON cc.clientFk = c.id