This commit is contained in:
邹宗楠
2023-02-14 17:19:05 +08:00
parent ea2f6bcc16
commit 6ecee0ad83
3 changed files with 14 additions and 6 deletions

View File

@@ -3526,7 +3526,7 @@ func GetStoreCategoryMap(ctx *jxcontext.Context, parentID, level int, storeID in
if err != nil { if err != nil {
return nil, err return nil, err
} }
if ctx.GetLoginType() != weixin.AuthTypeMP && ctx.GetLoginType() != weixin.AuthTypeMini && ctx.GetLoginType() != weixin.AuthTypeWxApp && ctx.GetLoginType() != weixin.AuthTypeWxAppCaishi && ctx.GetLoginType() != auth2.AuthTypeMobile { if ctx.GetLoginType() != auth2.AuthTypePassword && ctx.GetLoginType() != weixin.AuthTypeMP && ctx.GetLoginType() != weixin.AuthTypeMini && ctx.GetLoginType() != weixin.AuthTypeWxApp && ctx.GetLoginType() != weixin.AuthTypeWxAppCaishi && ctx.GetLoginType() != auth2.AuthTypeMobile {
return storeCatMaps, err return storeCatMaps, err
} }
//表示没有门店分类 //表示没有门店分类

View File

@@ -55,6 +55,7 @@ func HttpToGuoYuan(param map[string]interface{}, requestType string) (*http.Resp
var paramData []byte var paramData []byte
var err error var err error
if requestType == "order" { if requestType == "order" {
param["data"] = utils.Format4Output(param["data"], false)
paramData, err = json.Marshal([]interface{}{param}) paramData, err = json.Marshal([]interface{}{param})
if err != nil { if err != nil {
return nil, err return nil, err
@@ -80,6 +81,7 @@ func HttpToGuoYuan(param map[string]interface{}, requestType string) (*http.Resp
if err != nil { if err != nil {
return nil, err return nil, err
} }
httpReq.Header.Set("Content-Type", "application/json") httpReq.Header.Set("Content-Type", "application/json")
httpRes, err := http.DefaultClient.Do(httpReq) httpRes, err := http.DefaultClient.Do(httpReq)

View File

@@ -5,6 +5,7 @@ import (
"git.rosy.net.cn/jx-callback/business/partner/purchase/tiktok_store" "git.rosy.net.cn/jx-callback/business/partner/purchase/tiktok_store"
"git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/globals/api"
"github.com/astaxie/beego/server/web" "github.com/astaxie/beego/server/web"
beego "github.com/astaxie/beego/server/web"
"strings" "strings"
) )
@@ -15,12 +16,17 @@ type TiktokController struct {
// CallbackTiktokOrderMsg 抖店用户下单订单推送 (tiktokStore) // CallbackTiktokOrderMsg 抖店用户下单订单推送 (tiktokStore)
func (t *TiktokController) CallbackTiktokOrderMsg() { func (t *TiktokController) CallbackTiktokOrderMsg() {
// 1.防伪校验 // 1.防伪校验
resp, byteList := api.TiktokStore.EventSignChange(t.Ctx.Request) var byteList []byte
if resp.Code != 0 { var resp *tiktok_api.CallbackResponse
t.Data["json"] = resp if beego.BConfig.RunMode != "jxgy" {
t.ServeJSON() resp, byteList = api.TiktokStore.EventSignChange(t.Ctx.Request)
return if resp.Code != 0 {
t.Data["json"] = resp
t.ServeJSON()
return
}
} }
if strings.Contains(string(byteList), "\"msg_id\":\"0\"") { if strings.Contains(string(byteList), "\"msg_id\":\"0\"") {
t.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackSuccessCode, Msg: tiktok_api.CallbackSuccess} t.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackSuccessCode, Msg: tiktok_api.CallbackSuccess}
t.ServeJSON() t.ServeJSON()