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

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

Browse Source
This commit is contained in:
邹宗楠
2022-12-24 11:19:11 +08:00
parent 25062f829b 4578992eea
commit fd8d0b987c
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/model/dao/store.go
View File

@@ -195,7 +195,9 @@ func getStoreDetail(db *DaoDB, storeID, vendorID int, vendorStoreID, vendorOrgCo
func GetStoreDetail(db *DaoDB, storeID, vendorID int, vendorOrgCode string) (storeDetail *StoreDetail, err error) {
return getStoreDetail(db, storeID, vendorID, "", vendorOrgCode)
}
func GetStoreDetailForDD(db *DaoDB, storeID, vendorID int, vendorStoreID, vendorOrgCode string) (storeDetail *StoreDetail, err error) {
return getStoreDetail(db, storeID, vendorID, vendorStoreID, vendorOrgCode)
}
func GetStoreDetailByVendorStoreID(db *DaoDB, vendorStoreID string, vendorID int, vendorOrgCode string) (storeDetail *StoreDetail, err error) {
if vendorID != model.VendorIDJX {
return getStoreDetail(db, 0, vendorID, vendorStoreID, vendorOrgCode)

6
business/partner/delivery/tiktok_store/waybill.go
View File

@@ -41,12 +41,14 @@ func (c *DeliveryHandler) CreateStore(ctx *jxcontext.Context, storeDetail *dao.S
}
func (c *DeliveryHandler) GetStore(ctx *jxcontext.Context, storeID int, vendorStoreID string) (storeDetail *dao.StoreDetail2, err error) {
relInfo, err := dao.GetStoreDetail(dao.GetDB(), storeID, model.VendorIDDD, "")
globals.SugarLogger.Debugf("storeID=======%d vendorStoreID==========%s", storeID, vendorStoreID)
relInfo, err := dao.GetStoreDetailForDD(dao.GetDB(), storeID, model.VendorIDDD, vendorStoreID, "")
if err != nil {
return nil, errors.New("获取抖音平台账号信息失败，请重试")
}
globals.SugarLogger.Debugf("relInfo=========%s", utils.Format4Output(relInfo, false))
apiObj := getAPI(relInfo.VendorOrgCode)
globals.SugarLogger.Debugf("apiObj=============%v", apiObj)
globals.SugarLogger.Debugf("relInfo.VendorOrgCode===========%s,apiObj=============%v", relInfo.VendorOrgCode, apiObj)
if storeInfo, err := apiObj.GetStoreDetail(&shop_getStoreDetail_request.ShopGetStoreDetailParam{
StoreId: vendorStoreID,
}); err == nil {