From f2ff97b1d3d0abc64e5f2812dfd2cdea58b55013 Mon Sep 17 00:00:00 2001
From: Gauthier LO <lo.gauthier.glo@gmail.com>
Date: Tue, 22 Aug 2023 15:57:29 +0200
Subject: [PATCH] fix: cancelInvoice

---
 .../business/mapper/xml/PlatformOrderMapper.xml      | 12 +++++++++---
 .../resources/templates/breakdownInvoiceMail.ftl     |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMapper.xml
index 296fea906..eb48b0e57 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMapper.xml
@@ -597,8 +597,11 @@
             packaging_material_fee = 0.0,
             erp_status =
                 CASE erp_status
-                    WHEN 4 THEN 3
-                    END
+                    WHEN '4' THEN '3'
+                    WHEN '3' THEN '3'
+                    WHEN '1' THEN '1'
+                    WHEN '2' THEN '2'
+                END
         WHERE shipping_invoice_number = #{invoiceNumber};
     </update>
     <update id="cancelBatchInvoice">
@@ -610,7 +613,10 @@
             packaging_material_fee = 0.0,
             erp_status =
                 CASE erp_status
-                    WHEN 4 THEN 3
+                    WHEN '4' THEN '3'
+                    WHEN '3' THEN '3'
+                    WHEN '1' THEN '1'
+                    WHEN '2' THEN '2'
                 END
         WHERE shipping_invoice_number IN
         <foreach collection="invoiceNumbers" separator="," open="(" close=")" index="index" item="invoiceNumber">
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/templates/breakdownInvoiceMail.ftl b/jeecg-module-system/jeecg-system-biz/src/main/resources/templates/breakdownInvoiceMail.ftl
index 7134a2fc4..5937bc5d4 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/templates/breakdownInvoiceMail.ftl
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/templates/breakdownInvoiceMail.ftl
@@ -95,4 +95,4 @@
             </tbody>
         </table>
     </body>
-</html>"
\ No newline at end of file
+</html>
\ No newline at end of file