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

aa

Browse Source
This commit is contained in:
苏尹岚
2021-03-26 14:48:20 +08:00
parent b3c7d41958
commit e552c8453e
3 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
business/model/dao/common.go
View File

@@ -55,3 +55,22 @@ func GetVendorOrgCode(db *DaoDB, vendorID int, vendorOrgCode, vendorType string)
err = GetRows(db, &vendorOrgs, sql, sqlParams) err = GetRows(db, &vendorOrgs, sql, sqlParams)
return vendorOrgs, err return vendorOrgs, err
} }
func GetVendorOrgCodeByKey(db *DaoDB, vendorID int, appKey string) (vendorOrg *model.VendorOrgCode, err error) {
sql := `
SELECT *
FROM vendor_org_code
WHERE deleted_at = ?
`
sqlParams := []interface{}{utils.DefaultTimeValue}
if vendorID != -1 {
sql += " AND vendor_id = ?"
sqlParams = append(sqlParams, vendorID)
}
if appKey != "" {
sql += " AND app_key = ?"
sqlParams = append(sqlParams, appKey)
}
err = GetRow(db, &vendorOrg, sql, sqlParams)
return vendorOrg, err
}

17
business/partner/purchase/jd/jd.go
View File

@@ -41,13 +41,16 @@ func GetAPI(appOrgCode string) (apiObj *jdapi.API) {
} }
func AppKey2OrgCode(appKey string) (vendorOrgCode string) { func AppKey2OrgCode(appKey string) (vendorOrgCode string) {
apiList := partner.CurAPIManager.GetAppOrgCodeList(model.VendorIDJD) // apiList := partner.CurAPIManager.GetAppOrgCodeList(model.VendorIDJD)
for _, v := range apiList { // for _, v := range apiList {
jdAPI := partner.CurAPIManager.GetAPI(model.VendorIDJD, v).(*jdapi.API) // jdAPI := partner.CurAPIManager.GetAPI(model.VendorIDJD, v).(*jdapi.API)
if jdAPI.GetAppKey() == appKey { // if jdAPI.GetAppKey() == appKey {
vendorOrgCode = v // vendorOrgCode = v
break // break
} // }
// }
if code, err := dao.GetVendorOrgCodeByKey(dao.GetDB(), model.VendorIDJD, appKey); err == nil && code != nil {
vendorOrgCode = code.VendorOrgCode
} }
if vendorOrgCode == "" { if vendorOrgCode == "" {
globals.SugarLogger.Warnf("AppKey2OrgCode appKey:%s get empty vendorOrgCode", appKey) globals.SugarLogger.Warnf("AppKey2OrgCode appKey:%s get empty vendorOrgCode", appKey)

6
globals/api/apimanager/apimanager.go
View File

@@ -47,12 +47,10 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{})
api.JdAPI = jdapi.New(code.Token, code.AppKey, code.AppSecret) api.JdAPI = jdapi.New(code.Token, code.AppKey, code.AppSecret)
pfAPI = api.JdAPI pfAPI = api.JdAPI
if configs, err := dao.QueryConfigs(dao.GetDB(), "jdStorePageCookie", model.ConfigTypeCookie, ""); err == nil { if configs, err := dao.QueryConfigs(dao.GetDB(), "jdStorePageCookie", model.ConfigTypeCookie, ""); err == nil {
JdStorePageCookie := configs[0].Value api.JdAPI.SetJdCookie(configs[0].Value)
api.JdAPI.SetJdCookie(JdStorePageCookie)
} }
if configs, err := dao.QueryConfigs(dao.GetDB(), "jdStorePageEarning", model.ConfigTypeCookie, ""); err == nil { if configs, err := dao.QueryConfigs(dao.GetDB(), "jdStorePageEarning", model.ConfigTypeCookie, ""); err == nil {
jdStorePageEarning := configs[0].Value api.JdAPI.SetCookie("user", configs[0].Value)
api.JdAPI.SetCookie("user", jdStorePageEarning)
} }
} }
case model.VendorIDMTWM: case model.VendorIDMTWM: