From d6d9ffd3439b62bf0b651cd74b0bde95deca96c1 Mon Sep 17 00:00:00 2001 From: Gauthier LO Date: Thu, 27 Mar 2025 15:09:04 +0100 Subject: [PATCH] hotfix: detail facture --- db/views/detail_de_facture.sql | 85 ++++++++++++------- .../mapper/xml/FactureDetailMapper.xml | 1 + 2 files changed, 57 insertions(+), 29 deletions(-) diff --git a/db/views/detail_de_facture.sql b/db/views/detail_de_facture.sql index 49dfa6116..483c6a05b 100644 --- a/db/views/detail_de_facture.sql +++ b/db/views/detail_de_facture.sql @@ -1,29 +1,56 @@ -CREATE OR REPLACE VIEW detail_de_facture AS -SELECT s.name AS 'Boutique', - po.platform_order_id AS 'N° de Mabang', - po.platform_order_number AS 'N° de commande', - po.tracking_number AS 'N° de suivi', - po.order_time AS 'Date de commande', - po.shipping_time AS 'Date d\'expédition', - po.recipient AS 'Nom de client', - po.country AS 'Pays', - po.postcode AS 'Code postal', - JSON_ARRAYAGG(sku.erp_code) AS 'SKU', - JSON_ARRAYAGG(sku.en_name) AS 'Nom produits', - JSON_ARRAYAGG(poc.quantity) AS 'Quantité', - SUM(poc.purchase_fee) AS 'Frais d\'achat', - po.fret_fee AS 'Frais de FRET', - SUM(poc.shipping_fee) AS 'Frais de livraison', - po.order_service_fee + SUM(poc.service_fee) AS 'Frais de service', - po.picking_fee + SUM(poc.picking_fee) AS 'Frais de préparation', - po.packaging_material_fee AS 'Frais de matériel d\'emballage', - SUM(poc.vat) AS 'TVA', - po.shipping_invoice_number AS 'N° de facture' -FROM platform_order po - JOIN shop s ON po.shop_id = s.id - RIGHT JOIN platform_order_content poc ON po.id = poc.platform_order_id - JOIN sku ON poc.sku_id = sku.id -WHERE shipping_invoice_number IS NOT NULL - AND poc.erp_status <> 5 -GROUP BY po.id, s.name, po.order_time -ORDER BY s.name, po.order_time; \ No newline at end of file +create definer = admin@`%` view detail_de_facture as +select `s`.`name` AS `Boutique`, + `po`.`platform_order_id` AS `N° de Mabang`, + `po`.`platform_order_number` AS `N° de commande`, + `po`.`tracking_number` AS `N° de suivi`, + `po`.`order_time` AS `Date de commande`, + `po`.`shipping_time` AS `Date d'expédition`, + `po`.`recipient` AS `Nom de client`, + `po`.`country` AS `Pays`, + `po`.`postcode` AS `Code postal`, + json_arrayagg(`wia_app`.`sku`.`erp_code`) AS `SKU`, + json_arrayagg(`wia_app`.`sku`.`en_name`) AS `Nom produits`, + json_arrayagg(`poc`.`quantity`) AS `Quantité`, + sum(`poc`.`purchase_fee`) AS `Frais d'achat`, + `po`.`fret_fee` AS `Frais de FRET`, + sum(`poc`.`shipping_fee`) AS `Frais de livraison`, + (`po`.`order_service_fee` + sum(`poc`.`service_fee`)) AS `Frais de service`, + (`po`.`picking_fee` + sum(`poc`.`picking_fee`)) AS `Frais de préparation`, + `po`.`packaging_material_fee` AS `Frais de matériel d'emballage`, + `po`.`insurance_fee` AS `Frais d'assurance produits`, + sum(`poc`.`vat`) AS `TVA`, + `po`.`shipping_invoice_number` AS `N° de facture` +from ((`wia_app`.`platform_order_content` `poc` left join (`wia_app`.`platform_order` `po` join `wia_app`.`shop` `s` + on ((`po`.`shop_id` = `s`.`id`))) + on ((`po`.`id` = `poc`.`platform_order_id`))) join `wia_app`.`sku` on ((`poc`.`sku_id` = `wia_app`.`sku`.`id`))) +where ((`po`.`order_time` > '2024-01-01') and (`po`.`shipping_invoice_number` is not null) and + (`poc`.`erp_status` <> 5)) +group by `po`.`id`, `s`.`name`, `po`.`order_time` +order by `s`.`name`, `po`.`order_time`; + +-- comment on column detail_de_facture.Boutique not supported: 店铺名称 + +-- comment on column detail_de_facture.`N° de Mabang` not supported: 平台订单号码 + +-- comment on column detail_de_facture.`N° de commande` not supported: 平台订单交易号 + +-- comment on column detail_de_facture.`N° de suivi` not supported: 物流跟踪号 + +-- comment on column detail_de_facture.`Date de commande` not supported: 订单交易时间 + +-- comment on column detail_de_facture.`Date d'expédition` not supported: 订单发货时间 + +-- comment on column detail_de_facture.`Nom de client` not supported: 订单收件人 + +-- comment on column detail_de_facture.Pays not supported: 订单收件人国家 + +-- comment on column detail_de_facture.`Code postal` not supported: 订单收件人邮编 + +-- comment on column detail_de_facture.`Frais de FRET` not supported: 物流挂号费 + +-- comment on column detail_de_facture.`Frais de matériel d'emballage` not supported: 包材费 + +-- comment on column detail_de_facture.`Frais d'assurance produits` not supported: 物流保险费 + +-- comment on column detail_de_facture.`N° de facture` not supported: 物流发票号 + diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/FactureDetailMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/FactureDetailMapper.xml index 12b6368e5..24ed2a344 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/FactureDetailMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/FactureDetailMapper.xml @@ -35,6 +35,7 @@ po.order_service_fee + SUM(poc.service_fee) AS 'Frais de service', po.picking_fee + SUM(poc.picking_fee) AS 'Frais de préparation', po.packaging_material_fee AS 'Frais de matériel d\'emballage', + COALESCE(po.insurance_fee, 0.00) AS 'Frais d\'assurance produits', SUM(poc.vat) AS 'TVA', po.shipping_invoice_number AS 'N° de facture' FROM platform_order po