diff --git a/business/jxutils/tasks/configrefresh.go b/business/jxutils/tasks/configrefresh.go index ba94d648f..3e033d968 100644 --- a/business/jxutils/tasks/configrefresh.go +++ b/business/jxutils/tasks/configrefresh.go @@ -178,20 +178,21 @@ func RefreshFnToken() (err error) { if tokenInfo, err := api.FnAPI.GetAccessToken(); err == nil { token = tokenInfo.BusinessDataObj.AccessToken refreshToken = tokenInfo.BusinessDataObj.RefreshToken + sql := `UPDATE config SET token = ?,refresh_token = ? WHERE thirdparty = ?` + 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) + } + if _, err = fnpsapi.HttpToGuoYuanFN(map[string]interface{}{"token": token, "refresh_token": refreshToken}, fnpsapi.FengNiaoCallbackTypeToken, model.ServerTypeFruits); err != nil { + globals.SugarLogger.Debugf("菜市蜂鸟token通知到宠物错误:%v", err) + } } else { globals.SugarLogger.Errorf("RefreshFnToken RefreshToken failed with error:%v", err) } - sql := `UPDATE config SET token = ?,refresh_token = ? WHERE thirdparty = ?` - 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) - } - if _, err = fnpsapi.HttpToGuoYuanFN(map[string]interface{}{"token": token, "refresh_token": refreshToken}, fnpsapi.FengNiaoCallbackTypeToken, model.ServerTypeFruits); err != nil { - globals.SugarLogger.Debugf("菜市蜂鸟token通知到宠物错误:%v", err) - } } return token, expireTimeStr, refreshToken diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index 67301c40b..f1cf7d36b 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -3,6 +3,7 @@ package localjx import ( "errors" "fmt" + "git.rosy.net.cn/jx-callback/globals" "math" "regexp" "strings" @@ -242,6 +243,8 @@ func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64, return outJxOrder, err } + globals.SugarLogger.Debugf("----jxorder:= %s", utils.Format4Output(jxOrder, false)) + globals.SugarLogger.Debugf("----outJxOrder:= %s", utils.Format4Output(outJxOrder, false)) if outJxOrder.TotalPrice != jxOrder.TotalPrice && jxOrder.IsPriceDefend != model.YES { return nil, fmt.Errorf("商品或配送信息发生改变,请重新下单") } @@ -1026,10 +1029,6 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64 outJxOrder.FreightPrice = 0 } } - // ?????????????????????? 测试 - if storeDetail.ID == 668470 || storeDetail.ID == 668469 || storeDetail.ID == 800397 { - outJxOrder.FreightPrice = 1 - } if IsDeliverySelf { outJxOrder.FreightPrice = 0