From 16561246feb395bc4288ad172daabf0bbde56b5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Tue, 27 Aug 2024 14:29:32 +0800
Subject: [PATCH] 1

---
 .../jxcallback/scheduler/defsch/defsch_afs.go | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch_afs.go b/business/jxcallback/scheduler/defsch/defsch_afs.go
index b1ac9bf6b..ccee3ec02 100644
--- a/business/jxcallback/scheduler/defsch/defsch_afs.go
+++ b/business/jxcallback/scheduler/defsch/defsch_afs.go
@@ -1,6 +1,7 @@
 package defsch
 
 import (
+	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/jxutils/netprinter"
@@ -23,6 +24,9 @@ var (
 )
 
 func (s *DefScheduler) OnAfsOrderNew(order *model.AfsOrder, isPending bool) (err error) {
+	if order.VendorOrderID == "3301223263215186716" {
+		globals.SugarLogger.Debugf("-----------OnAfsOrderNew := %s", utils.Format4Output(order, false))
+	}
 	if order.Status == model.AfsOrderStatusWait4Approve {
 		if !isPending {
 			if isAutoRejectAfsOrder(order) {
@@ -45,19 +49,19 @@ func (s *DefScheduler) OnAfsOrderNew(order *model.AfsOrder, isPending bool) (err
 				weixinmsg.NotifyAfsOrderStatus(order)
 				push.NotifyAfsOrder(order)
 			}
-
-			// 京西云打印机打印数据-如果门店使用京西打印机才使用如下代码块
-			store, err := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode)
-			if err == nil && store.PrinterVendorID == model.VendorIDJxprint && store.IsPrintCancelOrder == model.YES {
-				if handler := partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID); handler != nil {
-					orderObj, err2 := handler.GetOrder(order.VendorOrgCode, order.VendorOrderID, "")
-					if err2 != nil {
-						return err
-					}
-					netprinter.PrintOrderByOrder(jxcontext.AdminCtx, orderObj, model.PrintAfsOrder, order)
+		}
+	}
+	if order.Status == model.AfsOrderStatusWait4Approve || order.Status == model.AfsOrderStatusFinished || order.Status == model.AfsOrderStatusNew {
+		// 京西云打印机打印数据-如果门店使用京西打印机才使用如下代码块
+		store, err := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode)
+		if err == nil && store.PrinterVendorID == model.VendorIDJxprint && store.IsPrintCancelOrder == model.YES {
+			if handler := partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID); handler != nil {
+				orderObj, err2 := handler.GetOrder(order.VendorOrgCode, order.VendorOrderID, "")
+				if err2 != nil {
+					return err
 				}
+				netprinter.PrintOrderByOrder(jxcontext.AdminCtx, orderObj, model.PrintAfsOrder, order)
 			}
-
 		}
 	}
 	return err