Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

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 (

controllers/fn_callback.go

@@ -7,7 +7,9 @@ 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/client/orm"
 	"github.com/astaxie/beego/server/web"
 	"io/ioutil"
 	"net/http"
@@ -96,10 +98,14 @@ func (c *FnController) FnToken() {
 		}
 
 		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