liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2026-01-02 19:24:05 +08:00
parent ffd9b37ce2
commit 67d9c5ecda
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
business/jxcallback/scheduler/basesch/basesch_ext.go
View File

@@ -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
}

1
business/jxutils/tasks/configrefresh.go
View File

@@ -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)
}