1
This commit is contained in:
@@ -2,16 +2,17 @@ package defsch
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"math/rand"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
"git.rosy.net.cn/baseapi/platformapi/dadaapi"
|
"git.rosy.net.cn/baseapi/platformapi/dadaapi"
|
||||||
"git.rosy.net.cn/baseapi/platformapi/fnpsapi"
|
"git.rosy.net.cn/baseapi/platformapi/fnpsapi"
|
||||||
"git.rosy.net.cn/baseapi/platformapi/mtpsapi"
|
"git.rosy.net.cn/baseapi/platformapi/mtpsapi"
|
||||||
"git.rosy.net.cn/baseapi/platformapi/uuptapi"
|
"git.rosy.net.cn/baseapi/platformapi/uuptapi"
|
||||||
"git.rosy.net.cn/jx-callback/business/jxcallback/orderman"
|
"git.rosy.net.cn/jx-callback/business/jxcallback/orderman"
|
||||||
"git.rosy.net.cn/jx-callback/business/jxutils/smsmsg"
|
"git.rosy.net.cn/jx-callback/business/jxutils/smsmsg"
|
||||||
"math/rand"
|
|
||||||
"strings"
|
|
||||||
"sync"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"git.rosy.net.cn/jx-callback/globals/api"
|
"git.rosy.net.cn/jx-callback/globals/api"
|
||||||
|
|
||||||
@@ -988,10 +989,10 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
|
|||||||
savedOrderInfo.retryCount++
|
savedOrderInfo.retryCount++
|
||||||
} else {
|
} else {
|
||||||
partner.CurOrderManager.OnOrderMsg(order, fmt.Sprintf("发起自动创建三方运单,目标创建运单平台[%s],创建失败:%v", jxutils.GetVendorName(vendorID), err), "")
|
partner.CurOrderManager.OnOrderMsg(order, fmt.Sprintf("发起自动创建三方运单,目标创建运单平台[%s],创建失败:%v", jxutils.GetVendorName(vendorID), err), "")
|
||||||
content := "您的门店 [" + storeDetail.Name + "],OrderID:[" + order.VendorOrderID + "],自动呼叫骑手失败[" + fmt.Sprintf(err.Error()) + "],请手动呼叫骑手"
|
//content := "您的门店 [" + storeDetail.Name + "],OrderID:[" + order.VendorOrderID + "],自动呼叫骑手失败[" + fmt.Sprintf(err.Error()) + "],请手动呼叫骑手"
|
||||||
if user, err := dao.GetUserByID(dao.GetDB(), "mobile", storeDetail.MarketManPhone); err == nil {
|
//if user, err := dao.GetUserByID(dao.GetDB(), "mobile", storeDetail.MarketManPhone); err == nil {
|
||||||
ddmsg.SendUserMessage(dingdingapi.MsgTyeText, user.UserID, "平台门店状态变化", content)
|
// ddmsg.SendUserMessage(dingdingapi.MsgTyeText, user.UserID, "平台门店状态变化", content)
|
||||||
}
|
//}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -1,12 +1,7 @@
|
|||||||
package controllers
|
package controllers
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
"git.rosy.net.cn/jx-callback/globals"
|
|
||||||
"git.rosy.net.cn/jx-callback/globals/api"
|
|
||||||
"github.com/astaxie/beego/server/web"
|
"github.com/astaxie/beego/server/web"
|
||||||
"io/ioutil"
|
|
||||||
"net/http"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type TaoBaoVegetableController struct {
|
type TaoBaoVegetableController struct {
|
||||||
@@ -14,30 +9,30 @@ type TaoBaoVegetableController struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// GetCode 淘菜菜获取商户授权code
|
// GetCode 淘菜菜获取商户授权code
|
||||||
func (c *TaoBaoVegetableController) GetCode() {
|
//func (c *TaoBaoVegetableController) GetCode() {
|
||||||
codeData := ""
|
// codeData := ""
|
||||||
if c.Ctx.Input.Method() == http.MethodPost {
|
// if c.Ctx.Input.Method() == http.MethodPost {
|
||||||
body, err := ioutil.ReadAll(c.Ctx.Request.Body)
|
// body, err := ioutil.ReadAll(c.Ctx.Request.Body)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
globals.SugarLogger.Debugf("商户收取code获取:%s,%s", string(body), err.Error())
|
// globals.SugarLogger.Debugf("商户收取code获取:%s,%s", string(body), err.Error())
|
||||||
c.Data["json"] = MsgFail()
|
// c.Data["json"] = MsgFail()
|
||||||
c.ServeJSON()
|
// c.ServeJSON()
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
globals.SugarLogger.Debugf("商户收取code获取:%s", string(body))
|
// globals.SugarLogger.Debugf("商户收取code获取:%s", string(body))
|
||||||
codeData = string(body)
|
// codeData = string(body)
|
||||||
} else {
|
// } else {
|
||||||
codeData = c.Ctx.Input.Query("code")
|
// codeData = c.Ctx.Input.Query("code")
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
tokenInfo, err := api.TaoVegetableApi.GetStoreToken(codeData, "")
|
// tokenInfo, err := api.TaoVegetableApi.GetStoreToken(codeData, "")
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
globals.SugarLogger.Debugf("获取门店token错误:%s", err.Error())
|
// globals.SugarLogger.Debugf("获取门店token错误:%s", err.Error())
|
||||||
c.Data["json"] = MsgFail()
|
// c.Data["json"] = MsgFail()
|
||||||
c.ServeJSON()
|
// c.ServeJSON()
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
fmt.Println(tokenInfo)
|
// fmt.Println(tokenInfo)
|
||||||
// 创建storeMap门店信息
|
// // 创建storeMap门店信息
|
||||||
// 刷新token
|
// // 刷新token
|
||||||
}
|
//}
|
||||||
|
|||||||
Reference in New Issue
Block a user