From 599fd5fd45454a569b43aa194ebf4a3ceffff7e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 19 Jan 2024 17:30:44 +0800
Subject: [PATCH 1/3] 1

---
 business/jxstore/act/act.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go
index 0ec854d1e..6c0ef3a95 100644
--- a/business/jxstore/act/act.go
+++ b/business/jxstore/act/act.go
@@ -800,7 +800,6 @@ func CreateActForMtByOrder(ctx *jxcontext.Context, act *model.Act, vendorIDs []i
 			for i := 1; i <= len(actData); i++ {
 				actData[i-1].Sequence = i
 			}
-			globals.SugarLogger.Debugf("=====actData:= %s", utils.Format4Output(actData, false))
 			actResult, faileInfoList, _ := api.MtwmAPI.RetailDiscountBatchSave2(storeDetail.VendorStoreID, mtwmapi.RetailActTypeDirectDown, actData)
 			for _, v := range actResult {
 				var (

From 16db84387943de57d24a7dd9f4cd34f4c492941d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 19 Jan 2024 17:44:21 +0800
Subject: [PATCH 2/3] 1

---
 controllers/fn_callback.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/controllers/fn_callback.go b/controllers/fn_callback.go
index 92e5f5eef..6549c804b 100644
--- a/controllers/fn_callback.go
+++ b/controllers/fn_callback.go
@@ -7,6 +7,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/business/model/legacymodel"
 	"git.rosy.net.cn/jx-callback/business/partner/delivery/fn"
+	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
 	"github.com/astaxie/beego/server/web"
 	"io/ioutil"
@@ -88,6 +89,7 @@ func (c *FnController) FnToken() {
 			return
 		}
 
+		globals.SugarLogger.Debugf("data := %s", string(data))
 		var token = &tokenInfo
 		if err = json.Unmarshal(data, &token); err != nil {
 			c.Data["json"] = &fnpsapi.SignatureIsNotOk
@@ -95,6 +97,7 @@ func (c *FnController) FnToken() {
 			return
 		}
 
+		globals.SugarLogger.Debugf("data := %s", utils.Format4Output(token, false))
 		db := dao.GetDB()
 		curConfig := &legacymodel.Config{
 			Thirdparty: "fn",

From b56d3096ab528558ee89a82ffb1adc66bdcd96c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 19 Jan 2024 17:48:00 +0800
Subject: [PATCH 3/3] 1

---
 controllers/fn_callback.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/controllers/fn_callback.go b/controllers/fn_callback.go
index 6549c804b..8cd600eb8 100644
--- a/controllers/fn_callback.go
+++ b/controllers/fn_callback.go
@@ -9,6 +9,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/partner/delivery/fn"
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
+	"github.com/astaxie/beego/client/orm"
 	"github.com/astaxie/beego/server/web"
 	"io/ioutil"
 	"net/http"
@@ -89,7 +90,6 @@ func (c *FnController) FnToken() {
 			return
 		}
 
-		globals.SugarLogger.Debugf("data := %s", string(data))
 		var token = &tokenInfo
 		if err = json.Unmarshal(data, &token); err != nil {
 			c.Data["json"] = &fnpsapi.SignatureIsNotOk
@@ -97,12 +97,15 @@ func (c *FnController) FnToken() {
 			return
 		}
 
-		globals.SugarLogger.Debugf("data := %s", utils.Format4Output(token, false))
 		db := dao.GetDB()
+
 		curConfig := &legacymodel.Config{
 			Thirdparty: "fn",
 		}
-		if err = dao.GetEntity(db, curConfig); err != nil {
+		if err = orm.NewOrm().Read(curConfig, "Thirdparty"); err != nil {
+			globals.SugarLogger.Errorf("RefreshFnToken RefreshToken failed with error:%v", err)
+		}
+		if err != nil {
 			c.Data["json"] = &fnpsapi.SignatureIsNotOk
 			c.ServeJSON()
 			return