From 1b700c9ddae63eb11c1a0fe65d6f2bb1d18943c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Mon, 9 Feb 2026 16:05:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9C=BA=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jxcallback/scheduler/defsch/defsch_afs.go | 26 +++++++------------
 business/jxutils/netprinter/netprinter.go     |  3 +++
 business/partner/printer/trendit/trendit.go   |  3 ---
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch_afs.go b/business/jxcallback/scheduler/defsch/defsch_afs.go
index 8a965c0c6..5001fe384 100644
--- a/business/jxcallback/scheduler/defsch/defsch_afs.go
+++ b/business/jxcallback/scheduler/defsch/defsch_afs.go
@@ -1,7 +1,10 @@
 package defsch
 
 import (
+	"git.rosy.net.cn/baseapi/platformapi/dingdingapi"
+	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
+	"git.rosy.net.cn/jx-callback/business/jxutils/ddmsg"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/jxutils/netprinter"
 	push "git.rosy.net.cn/jx-callback/business/jxutils/unipush"
@@ -46,26 +49,17 @@ func (s *DefScheduler) OnAfsOrderNew(order *model.AfsOrder, isPending bool) (err
 				push.NotifyAfsOrder(order)
 			}
 		}
+	}
 
-		storeDetail, err := partner.CurOrderManager.LoadStoreDetail(order.StoreID, order.VendorID)
-		if err == nil {
-			if storeDetail.IsPrintRefundOrder == model.YES { // 打印退款订单
-				order2, _ := partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.VendorID)
-				_, err = netprinter.PrintRefundOrCancelOrder(jxcontext.AdminCtx, model.NO, order2, order2.JxStoreID)
-			}
+	storeDetail, err := partner.CurOrderManager.LoadStoreDetail(order.StoreID, order.VendorID)
+	if err == nil {
+		if storeDetail.IsPrintRefundOrder == model.YES { // 打印退款订单
+			ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "打印售后订单/取消订单", utils.Format4Output(storeDetail.ID, false))
+			order2, _ := partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.VendorID)
+			_, err = netprinter.PrintRefundOrCancelOrder(jxcontext.AdminCtx, model.NO, order2, order2.JxStoreID)
 		}
 	}
 
-	//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 {
-	//		orderObj, _ := partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.VendorID)
-	//		if orderObj != nil {
-	//			netprinter.PrintOrderByOrder(jxcontext.AdminCtx, orderObj, model.PrintAfsOrder, order)
-	//		}
-	//	}
-	//}
 	return err
 }
 
diff --git a/business/jxutils/netprinter/netprinter.go b/business/jxutils/netprinter/netprinter.go
index 4b204abbc..7a0bce1f0 100644
--- a/business/jxutils/netprinter/netprinter.go
+++ b/business/jxutils/netprinter/netprinter.go
@@ -147,6 +147,9 @@ func PrintRefundOrCancelOrder(ctx *jxcontext.Context, printType int, order *mode
 		storeDetail, _ := dao.GetStoreDetail(db, storeID, order.VendorID, order.VendorOrgCode)
 
 		printResult, err = handler.PrintCancelOrRefundOrder(ctx, printType, store, storeDetail, order)
+		globals.SugarLogger.Debugf("------printResult :=printType: %d ,storeID := %d", printType, storeDetail.ID)
+		globals.SugarLogger.Debugf("------printResult := %s", utils.Format4Output(printResult, false))
+		globals.SugarLogger.Debugf("------err := %v", err)
 		if err == nil {
 			dao.SetOrderPrintFlag(db, ctx.GetUserName(), order.VendorOrderID, order.VendorID, true)
 		}
diff --git a/business/partner/printer/trendit/trendit.go b/business/partner/printer/trendit/trendit.go
index 084d8b1e1..f76188136 100644
--- a/business/partner/printer/trendit/trendit.go
+++ b/business/partner/printer/trendit/trendit.go
@@ -131,9 +131,6 @@ func (p PrinterHandler) PrintStore(ctx *jxcontext.Context, store *model.Store, s
 }
 
 func (p PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printType int, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) {
-	if len(order.Skus) == 0 {
-		return
-	}
 	content := ""
 	voiceType := ""
 	if printType == model.YES { // 取消订单