Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
commit
71f66085f6
|
@ -5,15 +5,15 @@ BEGIN
|
||||||
DECLARE vFromDated DATE;
|
DECLARE vFromDated DATE;
|
||||||
DECLARE vForDeleteDated DATE;
|
DECLARE vForDeleteDated DATE;
|
||||||
DECLARE vManaId INT;
|
DECLARE vManaId INT;
|
||||||
DECLARE vManaAutoId INT;
|
DECLARE vManaAutoId INT;
|
||||||
DECLARE vClaimManaId INT;
|
DECLARE vClaimManaId INT;
|
||||||
DECLARE vManaBankId INT;
|
DECLARE vManaBankId INT;
|
||||||
DECLARE vManaGreugeTypeId INT;
|
DECLARE vManaGreugeTypeId INT;
|
||||||
DECLARE vManaFromDays INT;
|
DECLARE vManaFromDays INT;
|
||||||
DECLARE vManaToDays INT;
|
DECLARE vManaToDays INT;
|
||||||
|
|
||||||
SELECT id INTO vManaId
|
SELECT id INTO vManaId
|
||||||
FROM vn.component WHERE code = 'mana';
|
FROM vn.component WHERE code = 'mana';
|
||||||
|
|
||||||
SELECT id INTO vManaAutoId
|
SELECT id INTO vManaAutoId
|
||||||
FROM vn.component WHERE code = 'autoMana';
|
FROM vn.component WHERE code = 'autoMana';
|
||||||
|
@ -27,75 +27,68 @@ BEGIN
|
||||||
SELECT id INTO vManaGreugeTypeId
|
SELECT id INTO vManaGreugeTypeId
|
||||||
FROM vn.greugeType WHERE code = 'mana';
|
FROM vn.greugeType WHERE code = 'mana';
|
||||||
|
|
||||||
SELECT manaFromDays, manaToDays
|
SELECT manaFromDays, manaToDays
|
||||||
INTO vManaFromDays, vManaToDays
|
INTO vManaFromDays, vManaToDays
|
||||||
FROM vn.salespersonConfig;
|
FROM vn.salespersonConfig;
|
||||||
|
|
||||||
SELECT MAX(dated)
|
SELECT MAX(dated) INTO vFromDated
|
||||||
INTO vFromDated
|
FROM vn.clientManaCache;
|
||||||
FROM vn.clientManaCache;
|
|
||||||
|
|
||||||
DELETE
|
DELETE FROM vn.clientManaCache
|
||||||
FROM vn.clientManaCache
|
WHERE dated = vFromDated;
|
||||||
WHERE dated = vFromDated;
|
|
||||||
|
|
||||||
SELECT MAX(dated)
|
SELECT MAX(dated) INTO vFromDated
|
||||||
INTO vFromDated
|
FROM vn.clientManaCache;
|
||||||
FROM vn.clientManaCache;
|
|
||||||
|
|
||||||
IF ISNULL(vFromDated) THEN
|
IF vFromDated IS NULL THEN
|
||||||
SELECT manaDateFrom
|
SELECT manaDateFrom
|
||||||
INTO vFromDated
|
INTO vFromDated
|
||||||
FROM vn.salespersonConfig;
|
FROM vn.salespersonConfig;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
WHILE vFromDated + INTERVAL vManaToDays DAY < util.VN_CURDATE() DO
|
WHILE vFromDated + INTERVAL vManaToDays DAY < util.VN_CURDATE() DO
|
||||||
SELECT
|
SELECT vFromDated + INTERVAL vManaToDays DAY,
|
||||||
vFromDated + INTERVAL vManaToDays DAY,
|
vFromDated - INTERVAL vManaFromDays DAY
|
||||||
vFromDated - INTERVAL vManaFromDays DAY
|
INTO vToDated,
|
||||||
INTO
|
vForDeleteDated;
|
||||||
vToDated,
|
|
||||||
vForDeleteDated;
|
|
||||||
|
|
||||||
DELETE FROM vn.clientManaCache
|
DELETE FROM vn.clientManaCache
|
||||||
WHERE dated <= vForDeleteDated;
|
WHERE dated <= vForDeleteDated;
|
||||||
|
|
||||||
INSERT INTO vn.clientManaCache(clientFk, mana, dated)
|
INSERT INTO vn.clientManaCache(clientFk, mana, dated)
|
||||||
SELECT
|
SELECT Id_Cliente,
|
||||||
Id_Cliente,
|
SUM(mana),
|
||||||
SUM(mana),
|
vToDated
|
||||||
vToDated
|
FROM (
|
||||||
FROM
|
SELECT a.clientFk Id_Cliente, s.quantity * sc.value mana
|
||||||
(
|
FROM vn.ticket t
|
||||||
SELECT a.clientFk Id_Cliente, s.quantity * sc.value as mana
|
JOIN vn.address a ON a.id = t.addressFk
|
||||||
FROM vn.ticket t
|
JOIN vn.sale s ON s.ticketFk = t.id
|
||||||
JOIN vn.address a ON a.id = t.addressFk
|
JOIN vn.saleComponent sc ON sc.saleFk = s.id
|
||||||
JOIN vn.sale s on s.ticketFk = t.id
|
WHERE sc.componentFk IN (vManaAutoId, vManaId, vClaimManaId)
|
||||||
JOIN vn.saleComponent sc on sc.saleFk = s.id
|
AND t.shipped > vFromDated
|
||||||
WHERE sc.componentFk IN (vManaAutoId, vManaId, vClaimManaId)
|
AND DATE(t.shipped) <= vToDated
|
||||||
AND t.shipped > vFromDated
|
UNION ALL
|
||||||
AND date(t.shipped) <= vToDated
|
SELECT clientFk, - amountPaid
|
||||||
UNION ALL
|
FROM vn.receipt
|
||||||
SELECT clientFk, - amountPaid
|
WHERE bankFk = vManaBankId
|
||||||
FROM vn.receipt
|
AND payed > vFromDated
|
||||||
WHERE bankFk = vManaBankId
|
AND payed <= vToDated
|
||||||
AND payed > vFromDated
|
UNION ALL
|
||||||
AND payed <= vToDated
|
SELECT clientFk, amount
|
||||||
UNION ALL
|
FROM vn.greuge
|
||||||
SELECT clientFk, amount
|
WHERE greugeTypeFk = vManaGreugeTypeId
|
||||||
FROM vn.greuge
|
AND shipped > vFromDated
|
||||||
WHERE greugeTypeFk = vManaGreugeTypeId
|
AND shipped <= vToDated
|
||||||
AND shipped > vFromDated
|
UNION ALL
|
||||||
AND shipped <= vToDated
|
SELECT clientFk, mana
|
||||||
UNION ALL
|
FROM vn.clientManaCache
|
||||||
SELECT clientFk, mana
|
WHERE dated = vFromDated
|
||||||
FROM vn.clientManaCache
|
) sub
|
||||||
WHERE dated = vFromDated
|
GROUP BY Id_Cliente
|
||||||
) sub
|
HAVING Id_Cliente;
|
||||||
GROUP BY Id_Cliente
|
|
||||||
HAVING Id_Cliente;
|
|
||||||
|
|
||||||
SET vFromDated = vToDated;
|
SET vFromDated = vToDated;
|
||||||
END WHILE;
|
END WHILE;
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
Loading…
Reference in New Issue