From 846a168d79da5079caf8d724895377421212cb30 Mon Sep 17 00:00:00 2001
From: wany <13995595726@qq.com>
Date: Sun, 16 Mar 2025 10:35:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=BD=BF=E7=94=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ssjygl/invoice/log/InvoiceLogController.java  | 4 ++--
 .../service/ssjygl/invoice/log/InvoiceLogSyncService.java | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/invoice/log/InvoiceLogController.java b/ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/invoice/log/InvoiceLogController.java
index 8645df9..88ac136 100644
--- a/ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/invoice/log/InvoiceLogController.java
+++ b/ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/invoice/log/InvoiceLogController.java
@@ -158,7 +158,7 @@ public class InvoiceLogController extends Controller {
         String invoice_number = get("invoice_number");
         String invoice_code   = get("invoice_code");
         String order_sns      = get("order_sns");
-
-        renderJson(InvoiceLogSyncService.me.batchSave(invoice_number, invoice_code, order_sns, tokenuser));
+        Integer invoice_type  = getInt("invoice_type");
+        renderJson(InvoiceLogSyncService.me.batchSave(invoice_number, invoice_code, order_sns, tokenuser,invoice_type));
     }
 }
diff --git a/ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/invoice/log/InvoiceLogSyncService.java b/ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/invoice/log/InvoiceLogSyncService.java
index 6222f07..d261b65 100644
--- a/ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/invoice/log/InvoiceLogSyncService.java
+++ b/ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/invoice/log/InvoiceLogSyncService.java
@@ -32,7 +32,7 @@ public class InvoiceLogSyncService extends BaseSyncService {
      * @param sysuser
      * @return
      */
-    public Result batchSave(String invoice_number, String invoice_code, String order_sns, Sysuser sysuser) {
+    public Result batchSave(String invoice_number, String invoice_code, String order_sns, Sysuser sysuser, Integer invoice_type) {
         String[]     snarr       = order_sns.split(",");
         List<String> question    = new ArrayList<>();
         List<String> ordersnlist = new ArrayList<>();
@@ -74,14 +74,16 @@ public class InvoiceLogSyncService extends BaseSyncService {
             invoiceLog.setState(OrderStateEnum.RECEIVED.getStateid());
             invoiceLog.setCode(invoice_code);
             invoiceLog.setInvoiceNumber(invoice_number);
-            invoiceLog.setInvoiceType(2);
+//            invoiceLog.setInvoiceType(2);
+            invoiceLog.setInvoiceType(invoice_type);
             invoiceLog.setOrderSn(o.getSn());
             invoiceLog.setType(OrderTypeEnum.TEMP.getTypeid());
 
             logs.add(invoiceLog);
 
             o.setInvoiceSite(2);
-            o.setInvoiceType(2);
+//            o.setInvoiceType(2);
+            o.setInvoiceType(invoice_type);
             o.setInvoiceNumber(invoice_number);
             o.setInvoiceCode(invoice_code);