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:
邹宗楠
2023-09-12 18:39:43 +08:00
parent 65b704f9c8
commit c1f2454722
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/jxstore/cms/cms.go
View File

@@ -733,6 +733,9 @@ func GetCyclingLine(sLng, sLat, uLng, uLat float64) (polyLineList []string, dist
if err != nil { if err != nil {
return nil, 0, 0, err return nil, 0, 0, err
} }
if data == "" {
return nil, 0, 0, fmt.Errorf("获取骑行规划路线错误")
}
path := &baidunavi.RiderPath{} path := &baidunavi.RiderPath{}
if err := json.Unmarshal([]byte(data.(string)), path); err != nil { if err := json.Unmarshal([]byte(data.(string)), path); err != nil {
return nil, 0, 0, err return nil, 0, 0, err

2
business/partner/purchase/tao_vegetable/order.go
View File

@@ -249,7 +249,7 @@ func PushDelivererChangeInfo(order *model.GoodsOrder, bill *model.Waybill, deliv
LogisticsNo: utils.String2Pointer(bill.VendorWaybillID), LogisticsNo: utils.String2Pointer(bill.VendorWaybillID),
}, },
} }
return getAPI(order.VendorOrgCode, 0, "").DelivererChange(param) return getAPI(order.VendorOrgCode, order.JxStoreID, order.VendorStoreID).DelivererChange(param)
} }
func (p *PurchaseHandler) GetOrder(vendorOrgCode, vendorOrderID, vendorStoreID string) (order *model.GoodsOrder, err error) { func (p *PurchaseHandler) GetOrder(vendorOrgCode, vendorOrderID, vendorStoreID string) (order *model.GoodsOrder, err error) {

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

@@ -69,9 +69,6 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{})
} }
case model.VendorIDTaoVegetable: case model.VendorIDTaoVegetable:
api := api.TaoVegetableApi api := api.TaoVegetableApi
//if beego.BConfig.RunMode == "dev" {
// api.SetToken("50002C00414zMSClqLiSDjBr2N19748391yiazjtFmsgTOdbBftik0XDfkUQywSmcjfC")
//} else if api == nil || api.GetToken() == "" {
codes, _ := dao.GetVendorOrgCode(db, vendorID, appOrgCode, "platform") codes, _ := dao.GetVendorOrgCode(db, vendorID, appOrgCode, "platform")
if len(codes) == 0 { if len(codes) == 0 {
return nil return nil
@@ -89,8 +86,6 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{})
ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "DDC5657B43EE11E9A9FF525400E86DC0", "淘鲜达token过期", ",请重新授权") ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "DDC5657B43EE11E9A9FF525400E86DC0", "淘鲜达token过期", ",请重新授权")
} }
} }
//}
pfAPI = api pfAPI = api
case model.VendorIDEBAI: case model.VendorIDEBAI:
pfAPI = api.EbaiAPI pfAPI = api.EbaiAPI