Handle inter-account transactions properly.
This commit is contained in:
parent
d72cde9c04
commit
ac46f41cb3
2 changed files with 5 additions and 13 deletions
|
@ -73,14 +73,6 @@
|
||||||
(num (if numrow (cadr numrow) "ERROR"))
|
(num (if numrow (cadr numrow) "ERROR"))
|
||||||
(bankrow (assoc "bankId" head))
|
(bankrow (assoc "bankId" head))
|
||||||
(bank (if bankrow (cadr bankrow) "ERROR")))
|
(bank (if bankrow (cadr bankrow) "ERROR")))
|
||||||
(print head)
|
|
||||||
(print numrow)
|
|
||||||
(print bankrow)
|
|
||||||
(print (assoc (caar head) head))
|
|
||||||
(print (caar head))
|
|
||||||
(print "accountId")
|
|
||||||
(print (equal? "accountId" (caar head)))
|
|
||||||
(print (string->list (caar head)))
|
|
||||||
(make-bank-account num bank
|
(make-bank-account num bank
|
||||||
(map make-fio-transaction (cdr body))))
|
(map make-fio-transaction (cdr body))))
|
||||||
(let ()
|
(let ()
|
||||||
|
|
|
@ -149,16 +149,16 @@
|
||||||
(define (members-payments-process mb apikeys-file dir checked-fn)
|
(define (members-payments-process mb apikeys-file dir checked-fn)
|
||||||
(if apikeys-file
|
(if apikeys-file
|
||||||
(let* ((acc-list (load-accounts-list apikeys-file))
|
(let* ((acc-list (load-accounts-list apikeys-file))
|
||||||
(accounts (if acc-list (load-accounts acc-list dir) #f))
|
(all-accounts (if acc-list (load-accounts acc-list dir) #f))
|
||||||
(total (length accounts))
|
(total (length all-accounts))
|
||||||
(last-checked (get-latest-checked-id checked-fn)))
|
(last-checked (get-latest-checked-id checked-fn)))
|
||||||
(if accounts
|
(if all-accounts
|
||||||
(with-progress%
|
(with-progress%
|
||||||
#t "Payments"
|
#t "Payments"
|
||||||
(progress%-advance 0)
|
(progress%-advance 0)
|
||||||
(let loop ((mb mb)
|
(let loop ((mb mb)
|
||||||
(idx 0)
|
(idx 0)
|
||||||
(accounts accounts))
|
(accounts all-accounts))
|
||||||
(if (null? accounts)
|
(if (null? accounts)
|
||||||
(let ((mb (members-base-update mb identity member-sort-payments)))
|
(let ((mb (members-base-update mb identity member-sort-payments)))
|
||||||
(progress%-advance 1)
|
(progress%-advance 1)
|
||||||
|
@ -166,7 +166,7 @@
|
||||||
(let ()
|
(let ()
|
||||||
(progress%-advance (/ idx total))
|
(progress%-advance (/ idx total))
|
||||||
(loop (if (car accounts)
|
(loop (if (car accounts)
|
||||||
(members-payments-process-bank mb (car accounts) last-checked accounts)
|
(members-payments-process-bank mb (car accounts) last-checked all-accounts)
|
||||||
mb)
|
mb)
|
||||||
(add1 idx)
|
(add1 idx)
|
||||||
(cdr accounts))))))
|
(cdr accounts))))))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue