This commit is contained in:
邹宗楠
2023-02-14 16:30:04 +08:00
parent 19bb2f1e3c
commit ea2f6bcc16
2 changed files with 20 additions and 11 deletions

View File

@@ -24,9 +24,10 @@ func OnOrderMsg(msgId string, msg interface{}) (response *tiktokShop.CallbackRes
if err != nil {
return tiktokShop.Err2CallbackResponse(err, "")
}
vendorStoreID := orderDetail.ShopId
if vendorStoreID != 0 {
storeDetail, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), utils.Int64ToStr(vendorStoreID), model.VendorIDDD, "")
vendorStoreID := orderDetail.SkuOrderList[0].StoreInfo.StoreId
if vendorStoreID != "" {
storeDetail, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreID, model.VendorIDDD, "")
if err != nil || storeDetail == nil || storeDetail.Store.ID == 0 {
// 当前订单所属门店不属于菜市时,将消息推送到果园
gyMsg := map[string]interface{}{"tag": msgId, "msg_id": utils.Int64ToStr(time.Now().Unix()) + msgId, "data": msg}
@@ -37,8 +38,8 @@ func OnOrderMsg(msgId string, msg interface{}) (response *tiktokShop.CallbackRes
}
result, _ := ioutil.ReadAll(gyResult.Body)
var guoYuan *tiktokShop.CallbackResponse
if err := json.Unmarshal(result, guoYuan); err != nil {
return tiktokShop.Err2CallbackResponse(err, "")
if err2 := json.Unmarshal(result, guoYuan); err2 != nil {
return tiktokShop.Err2CallbackResponse(err2, "")
}
return guoYuan
}
@@ -51,12 +52,19 @@ func OnOrderMsg(msgId string, msg interface{}) (response *tiktokShop.CallbackRes
}
func HttpToGuoYuan(param map[string]interface{}, requestType string) (*http.Response, error) {
globals.SugarLogger.Debugf("=========param %s", utils.Format4Output(param, false))
paramData, err := json.Marshal(param)
if err != nil {
return nil, err
var paramData []byte
var err error
if requestType == "order" {
paramData, err = json.Marshal([]interface{}{param})
if err != nil {
return nil, err
}
} else {
paramData, err = json.Marshal(param)
if err != nil {
return nil, err
}
}
body := strings.NewReader(string(paramData))
url := ""

View File

@@ -73,7 +73,8 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{})
if len(codes) == 0 {
return nil
}
pfAPI = tiktok_api.New(beego.AppConfig.DefaultString("tiktokShopAppId", ""), beego.AppConfig.DefaultString("tiktokShopAppSecret", ""), codes[0].Token)
// pfAPI = tiktok_api.New(beego.AppConfig.DefaultString("tiktokShopAppId", ""), beego.AppConfig.DefaultString("tiktokShopAppSecret", ""), codes[0].Token)
pfAPI = tiktok_api.New(beego.AppConfig.DefaultString("tiktokShopAppId", ""), beego.AppConfig.DefaultString("tiktokShopAppSecret", ""), "{\"access_token\":\"41a91991-7652-4d20-a7ef-12396a1a42ea\",\"expires_in\":1676849351,\"scope\":\"SCOPE\",\"shop_id\":57939570,\"shop_name\":\"京西菜市速食\",\"refresh_token\":\"3d4ad783-8371-48ae-8212-3ee143ea7aca\",\"authority_id\":\"\"}")
}
return pfAPI
}