verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity

7253-devToTest_2418 #2350

Merged
alexm merged 320 commits from 7253-devToTest_2418 into test 2024-04-23 08:02:46 +00:00
Conversation 0 Commits 320 Files Changed 212 +14 -13
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2c0c346a7b - Show all commits

23
db/routines/vn/procedures/creditRecovery.sql
View File

@ -16,31 +16,32 @@ 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,
timestampadd(DAY, r.period, sub2.created) 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 * FROM clientCredit SELECT clientFk, amount, created
ORDER BY created DESC FROM clientCredit
LIMIT 10000000000000000000 ORDER BY created DESC
) sub LIMIT 10000000000000000000
) 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
SET c.credit = newCredit; SET c.credit = newCredit;
DROP TEMPORARY TABLE tCreditClients; DROP TEMPORARY TABLE tCreditClients;
COMMIT; COMMIT;

4
db/versions/10984-navyDendro/00-firstScript.sql
View File

@ -1,4 +1,4 @@
-- Place your SQL code here -- Place your SQL code here
UPDATE bs.nightTask SET `schema`='vn' WHERE id=22; UPDATE bs.nightTask SET `schema`='vn' WHERE `procedure`='raidUpdate';
UPDATE bs.nightTask SET `schema`='vn',`procedure`='creditRecovery' WHERE id=30; UPDATE bs.nightTask SET `schema`='vn',`procedure`='creditRecovery' WHERE `procedure` ='recobro_credito';