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-10-11 17:30:14 +08:00
parent 8f33fff63f
commit d1eb821df3
2 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,6 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve
}} }}
api := getAPI(vendorOrgCode, 0, vendorStoreID) api := getAPI(vendorOrgCode, 0, vendorStoreID)
orderDetail, err := api.QueryOrderDetail(requestParam) orderDetail, err := api.QueryOrderDetail(requestParam)
globals.SugarLogger.Debugf("===========QueryOrderDetail := %v", err)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
@@ -345,7 +344,6 @@ func (c *PurchaseHandler) onOrderMsg(orderStatus, orderId string, orderCallback
// 商户接单/支付完成代表新订单 // 商户接单/支付完成代表新订单
if msg.OrderStatus == tao_vegetable.OrderStatusPayFinsh { if msg.OrderStatus == tao_vegetable.OrderStatusPayFinsh {
order, orderMap, err2 := c.getOrder("", msg.BizOrderId, msg.StoreId) order, orderMap, err2 := c.getOrder("", msg.BizOrderId, msg.StoreId)
globals.SugarLogger.Debugf("err2================ %v", err2)
if err = err2; err == nil { if err = err2; err == nil {
err = partner.CurOrderManager.OnOrderNew(order, status) err = partner.CurOrderManager.OnOrderNew(order, status)
if err == nil { if err == nil {

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

@@ -69,26 +69,24 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{})
} }
case model.VendorIDTaoVegetable: case model.VendorIDTaoVegetable:
api2 := api.TaoVegetableApi api2 := api.TaoVegetableApi
if api2 == nil || api2.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
}
code := codes[0]
api2 = tao_vegetable.NewTaoVegetable(code.AppKey, code.AppSecret, beego.AppConfig.DefaultString("taoVegetableServerUrl", ""))
if code.Token != "" {
var tokenInfo *tao_vegetable.StoreTokenInfo
if err := json.Unmarshal([]byte(code.Token), &tokenInfo); err != nil {
return nil return nil
} }
code := codes[0] if tokenInfo.AccessToken != "" && tokenInfo.ExpireTime > time.Now().UnixNano()/1e6 {
api2 = tao_vegetable.NewTaoVegetable(code.AppKey, code.AppSecret, beego.AppConfig.DefaultString("taoVegetableServerUrl", "")) api2.SetToken(tokenInfo.AccessToken)
if code.Token != "" { } else {
var tokenInfo *tao_vegetable.StoreTokenInfo ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "淘鲜达token过期", ",请重新授权")
if err := json.Unmarshal([]byte(code.Token), &tokenInfo); err != nil {
return nil
}
if tokenInfo.AccessToken != "" && tokenInfo.ExpireTime > time.Now().UnixNano()/1e6 {
api2.SetToken(tokenInfo.AccessToken)
} else {
ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "淘鲜达token过期", ",请重新授权")
}
} }
api.TaoVegetableApi = api2
} }
api.TaoVegetableApi = api2
pfAPI = api2 pfAPI = api2
case model.VendorIDEBAI: case model.VendorIDEBAI: