From 67d9c5ecdafb0d7d304bc539487c447a55664aff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 2 Jan 2026 19:24:05 +0800 Subject: [PATCH] 1 --- .../scheduler/basesch/basesch_ext.go | 23 +++++++++---------- business/jxutils/tasks/configrefresh.go | 1 - 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go index c70ee6bca..1b46f5889 100644 --- a/business/jxcallback/scheduler/basesch/basesch_ext.go +++ b/business/jxcallback/scheduler/basesch/basesch_ext.go @@ -2,7 +2,6 @@ package basesch import ( "fmt" - "git.rosy.net.cn/jx-callback/business/jxutils/netprinter" "strings" "time" @@ -321,17 +320,17 @@ func (c *BaseScheduler) AgreeOrRefuseRefund(ctx *jxcontext.Context, afsOrderID s dao.SetAfsOrderFlag(dao.GetDB(), ctx.GetUserName(), afsOrderID, vendorID, flag) } } - if approveType != partner.AfsApproveTypeRefused && err == nil { - storeDetail, err := partner.CurOrderManager.LoadStoreDetail(afsOrder.StoreID, afsOrder.VendorID) - if err != nil { - return err - } - if storeDetail.IsPrintRefundOrder == model.YES { // 打印退款订单 - order2, _ := partner.CurOrderManager.LoadOrder(afsOrder.VendorOrderID, afsOrder.VendorID) - order2.Status = model.AfsOrderStatusFinished - _, err = netprinter.PrintRefundOrCancelOrder(jxcontext.AdminCtx, model.NO, order2, afsOrder.StoreID) - } - } + //if approveType != partner.AfsApproveTypeRefused && err == nil { + // storeDetail, err := partner.CurOrderManager.LoadStoreDetail(afsOrder.StoreID, afsOrder.VendorID) + // if err != nil { + // return err + // } + // if storeDetail.IsPrintRefundOrder == model.YES { // 打印退款订单 + // order2, _ := partner.CurOrderManager.LoadOrder(afsOrder.VendorOrderID, afsOrder.VendorID) + // order2.Status = model.AfsOrderStatusFinished + // _, err = netprinter.PrintRefundOrCancelOrder(jxcontext.AdminCtx, model.NO, order2, afsOrder.StoreID) + // } + //} return err } diff --git a/business/jxutils/tasks/configrefresh.go b/business/jxutils/tasks/configrefresh.go index 3e033d968..863f872c8 100644 --- a/business/jxutils/tasks/configrefresh.go +++ b/business/jxutils/tasks/configrefresh.go @@ -182,7 +182,6 @@ func RefreshFnToken() (err error) { dao.ExecuteSQL(dao.GetDB(), sql, []interface{}{ token, refreshToken, "fn", }) - if _, err = fnpsapi.HttpToGuoYuanFN(map[string]interface{}{"token": token, "refresh_token": refreshToken}, fnpsapi.FengNiaoCallbackTypeToken, model.ServerTypeVegetable); err != nil { globals.SugarLogger.Debugf("菜市蜂鸟token通知到果园错误:%v", err) }