From 85e635ce6f8908310925f4a4f4b073e468544794 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 26 Dec 2025 14:07:41 +0800 Subject: [PATCH] 1 --- .../jxcallback/scheduler/defsch/defsch_afs.go | 16 +++--- business/partner/printer/feie/feie.go | 4 +- business/partner/printer/trendit/trendit.go | 4 +- business/partner/printer/xpyun/xpyun.go | 4 +- .../partner/printer/yilianyun/yilianyun.go | 4 +- business/partner/printer/zhongwu/zhongwu.go | 50 ++++++++++++++++++- business/partner/purchase/mtwm/callback.go | 2 - 7 files changed, 65 insertions(+), 19 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch_afs.go b/business/jxcallback/scheduler/defsch/defsch_afs.go index 5b72b0c7b..8a965c0c6 100644 --- a/business/jxcallback/scheduler/defsch/defsch_afs.go +++ b/business/jxcallback/scheduler/defsch/defsch_afs.go @@ -3,6 +3,7 @@ package defsch import ( "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" push "git.rosy.net.cn/jx-callback/business/jxutils/unipush" "git.rosy.net.cn/jx-callback/business/jxutils/weixinmsg" "git.rosy.net.cn/jx-callback/business/model" @@ -46,14 +47,13 @@ func (s *DefScheduler) OnAfsOrderNew(order *model.AfsOrder, isPending bool) (err } } - //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) - // order2.Status = model.AfsOrderStatusFinished - // _, err = netprinter.PrintRefundOrCancelOrder(jxcontext.AdminCtx, model.NO, order2, afsOrder.StoreID) - // } - //} + 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) + } + } } //if order.Status == model.AfsOrderStatusWait4Approve || order.Status == model.AfsOrderStatusFinished || order.Status == model.AfsOrderStatusNew { diff --git a/business/partner/printer/feie/feie.go b/business/partner/printer/feie/feie.go index b7891fe6f..f50a06181 100644 --- a/business/partner/printer/feie/feie.go +++ b/business/partner/printer/feie/feie.go @@ -287,7 +287,7 @@ func (c *PrinterHandler) getCancelOrRefundOrderContent(order *model.GoodsOrder, if printType == model.YES { // 取消订单 title = `取消订单详情
` } else { // 售后订单 - title = `退款订单详情
` + title = `售后订单详情
` } orderFmt += @@ -338,7 +338,7 @@ func (c *PrinterHandler) getCancelOrRefundOrderContentBig(order *model.GoodsOrde if printType == model.YES { // 退单 title = `取消订单详情
` } else { - title = `退款订单详情
` + title = `售后订单详情
` } orderFmt += `--------------------------------
下单时间: %s
 diff --git a/business/partner/printer/trendit/trendit.go b/business/partner/printer/trendit/trendit.go index 86f137091..c330933ec 100644 --- a/business/partner/printer/trendit/trendit.go +++ b/business/partner/printer/trendit/trendit.go @@ -481,7 +481,7 @@ func (c *PrinterHandler) getCancelOrRefundOrderContent(order *model.GoodsOrder, if printType == model.YES { // 取消订单 title = "取消订单详情" } else { // 售后订单 - title = "退货订单详情" + title = "售后订单详情" } //orderFmt += `
--------------------------------` orderFmt += ` @@ -521,7 +521,7 @@ func (c *PrinterHandler) getCancelOrRefundOrderContentBig(order *model.GoodsOrde if printType == model.YES { // 取消订单 title = `取消订单详情` } else { // 售后订单 - title = `退款订单详情` + title = `售后订单详情` } orderFmt += diff --git a/business/partner/printer/xpyun/xpyun.go b/business/partner/printer/xpyun/xpyun.go index 3fd9c73bb..07e6427da 100644 --- a/business/partner/printer/xpyun/xpyun.go +++ b/business/partner/printer/xpyun/xpyun.go @@ -498,7 +498,7 @@ func (c *PrinterHandler) getCancelOrRefundOrderContent(order *model.GoodsOrder, if printType == model.YES { // 取消订单 title = `取消订单详情
` } else { // 售后订单 - title = `退款订单详情
` + title = `售后订单详情
` } orderFmt += @@ -543,7 +543,7 @@ func (c *PrinterHandler) getCancelOrRefundOrderContentBig(order *model.GoodsOrde if printType == model.YES { // 取消订单 title = `取消订单详情
` } else { // 售后订单 - title = `退款订单详情
` + title = `售后订单详情
` } orderFmt += diff --git a/business/partner/printer/yilianyun/yilianyun.go b/business/partner/printer/yilianyun/yilianyun.go index dd9febbce..795d06998 100644 --- a/business/partner/printer/yilianyun/yilianyun.go +++ b/business/partner/printer/yilianyun/yilianyun.go @@ -272,7 +272,7 @@ func (c *PrinterHandler) getCancelOrRefundOrderContent(order *model.GoodsOrder, if printType == model.YES { // 取消订单 title = `
取消订单详情
\n` } else { // 售后订单 - title = `
退款订单详情
\n` + title = `
售后订单详情
\n` } orderFmt += @@ -324,7 +324,7 @@ func (c *PrinterHandler) getCancelOrRefundOrderContentBig(order *model.GoodsOrde if printType == model.YES { // 退单 title = `
取消订单详情
\n` } else { - title = `
退款订单详情
\n` + title = `
售后订单详情
\n` } orderFmt += `--------------------------------\n 门店名称: %s\n\n diff --git a/business/partner/printer/zhongwu/zhongwu.go b/business/partner/printer/zhongwu/zhongwu.go index d8bb385cb..e258efe4a 100644 --- a/business/partner/printer/zhongwu/zhongwu.go +++ b/business/partner/printer/zhongwu/zhongwu.go @@ -114,6 +114,45 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin return fmt.Sprintf(strings.Replace(orderFmt, "\n", "", -1), orderParams...) } +//退货/取消订单 正常尺寸模板 +func (c *PrinterHandler) getCancelOrRefundOrderContent(order *model.GoodsOrder, printType int, storeDetail *dao.StoreDetail) (content string) { + orderParams := []interface{}{} + orderFmt := `` + if storeDetail.BrandIsPrint == model.NO { + orderFmt += ` + %s + ` + if order.VendorOrgCode == "34665" { + orderParams = append(orderParams, globals.StoreNameEbai2) + } else { + orderParams = append(orderParams, storeDetail.BrandName) + } + } + + if printType == model.YES { // 取消订单 + orderFmt = `取消订单详情` + } else { // 售后订单 + orderFmt = `售后清淡详情` + } + + orderFmt += `******************************** +下单时间: %s +订单编号: %s + +%s#%d +共%d种%d件商品 +` + + orderParams = append(orderParams, + utils.Time2Str(order.OrderCreatedAt), + order.VendorOrderID, + jxutils.GetVendorName(order.VendorID), + order.OrderSeq, + ) + orderParams = append(orderParams, order.SkuCount, order.GoodsCount) + return fmt.Sprintf(strings.Replace(orderFmt, "\n", "", -1), orderParams...) +} + func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel string, storeDetail *dao.StoreDetail) (content string) { expectedDeliveryTime := order.ExpectedDeliveredTime if utils.IsTimeZero(expectedDeliveryTime) { @@ -241,7 +280,16 @@ func (c *PrinterHandler) PrintStore(ctx *jxcontext.Context, store *model.Store, } func (c *PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printType int, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { - return nil, err + if len(order.Skus) == 0 { + return + } + content := c.getCancelOrRefundOrderContent(order, printType, storeDetail) + + if content == "" { + return nil, nil + } + + return c.PrintMsg(ctx, store.PrinterSN, store.PrinterKey, order.VendorOrderID, content) } func (c *PrinterHandler) RegisterPrinter(ctx *jxcontext.Context, deviceID, deviceSecret, printerName string, storeID int64) (notUsed1, notUsed2 string, err error) { diff --git a/business/partner/purchase/mtwm/callback.go b/business/partner/purchase/mtwm/callback.go index 01e3bc47a..8b052275e 100644 --- a/business/partner/purchase/mtwm/callback.go +++ b/business/partner/purchase/mtwm/callback.go @@ -46,7 +46,6 @@ func OnCallbackMsg(msg *mtwmapi.CallbackMsg, msgType string) (response *mtwmapi. globals.SugarLogger.Debugf(" UnmarshalUseNumber err := %v", err) return nil } - globals.SugarLogger.Debugf("-------dataMap := %s", utils.Format4Output(dataMap, false)) if len(dataMap) != 0 { var storeMap = make(map[string]map[int][]string, 0) var skuStatus = make(map[int][]string, 0) @@ -58,7 +57,6 @@ func OnCallbackMsg(msg *mtwmapi.CallbackMsg, msgType string) (response *mtwmapi. operate[v.AppFoodCode] = fmt.Sprintf("%s:%s:0↑-1↓:前%d->后%d", v.OpAppKey, v.OpName, v.DiffContents.IsSoldOut.Origin, v.DiffContents.IsSoldOut.Result) } } - globals.SugarLogger.Debugf("-------storeMap := %s", utils.Format4Output(storeMap, false)) for k, v := range storeMap { storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), k, model.VendorIDMTWM, "") if storeDetail != nil {