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:
邹宗楠
2025-04-14 11:33:46 +08:00
parent 814284fb8c
commit 9b3b73fd52
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -178,20 +178,21 @@ func RefreshFnToken() (err error) {
if tokenInfo, err := api.FnAPI.GetAccessToken(); err == nil { if tokenInfo, err := api.FnAPI.GetAccessToken(); err == nil {
token = tokenInfo.BusinessDataObj.AccessToken token = tokenInfo.BusinessDataObj.AccessToken
refreshToken = tokenInfo.BusinessDataObj.RefreshToken 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 { } else {
globals.SugarLogger.Errorf("RefreshFnToken RefreshToken failed with error:%v", err) 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 return token, expireTimeStr, refreshToken

7
business/partner/purchase/jx/localjx/order.go
View File

@@ -3,6 +3,7 @@ package localjx
import ( import (
"errors" "errors"
"fmt" "fmt"
"git.rosy.net.cn/jx-callback/globals"
"math" "math"
"regexp" "regexp"
"strings" "strings"
@@ -242,6 +243,8 @@ func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64,
return outJxOrder, err 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 { if outJxOrder.TotalPrice != jxOrder.TotalPrice && jxOrder.IsPriceDefend != model.YES {
return nil, fmt.Errorf("商品或配送信息发生改变，请重新下单") return nil, fmt.Errorf("商品或配送信息发生改变，请重新下单")
} }
@@ -1026,10 +1029,6 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
outJxOrder.FreightPrice = 0 outJxOrder.FreightPrice = 0
} }
} }
// ?????????????????????? 测试
if storeDetail.ID == 668470 || storeDetail.ID == 668469 || storeDetail.ID == 800397 {
outJxOrder.FreightPrice = 1
}
if IsDeliverySelf { if IsDeliverySelf {
outJxOrder.FreightPrice = 0 outJxOrder.FreightPrice = 0