diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 96c734577..df013963e 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -1687,11 +1687,11 @@ func RefreshJdShopOrdersEarningPrice(ctx *jxcontext.Context, orderStartTime, ord appOrgCode string ) if beego.BConfig.RunMode == model.ServerTypeFruits { - appOrgCode = "339032" + appOrgCode = jdapi.JdVendorOrgCodeFruit } else if beego.BConfig.RunMode == model.ServerTypePet { - appOrgCode = "390558" + appOrgCode = jdapi.JdVendorOrgCodePet } else { - appOrgCode = "320406" + appOrgCode = jdapi.JdVendorOrgCodeVagetable } jdapi := partner.CurAPIManager.GetAPI(model.VendorIDJD, appOrgCode).(*jdapi.API) results, err := jdapi.GetJdShopOrders(utils.Str2Time(orderStartTime).Format("20060102"), utils.Str2Time(orderEndTime).Format("20060102"), globals.JdOrgCode, globals.JdLoginName) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 9c8af2123..bef2e99f3 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -1162,11 +1162,11 @@ func getCategoryByName(name string) string { handler, _ := partner.GetPurchasePlatformFromVendorID(model.VendorIDJD).(partner.IPurchasePlatformStoreSkuHandler) vendorOrgCode := "" if beego.BConfig.RunMode == model.ServerTypeFruits { - vendorOrgCode = "339032" + vendorOrgCode = jdapi.JdVendorOrgCodeFruit } else if beego.BConfig.RunMode == model.ServerTypePet { - vendorOrgCode = "390558" + vendorOrgCode = jdapi.JdVendorOrgCodePet } else { - vendorOrgCode = "320406" + vendorOrgCode = jdapi.JdVendorOrgCodeVagetable } vendorCategoryId, _ := handler.GetSkuCategoryIdByName(vendorOrgCode, name) return vendorCategoryId @@ -1909,11 +1909,11 @@ func GetJdUpcCodeByCode(ctx *jxcontext.Context, upcCode string) (productInfos [] func GetJdUpcCodeByName(ctx *jxcontext.Context, name, upcCode string) (productInfos []*jdapi.ProductInfo, err error) { appOrgCode := "" if beego.BConfig.RunMode == model.ServerTypeFruits { - appOrgCode = "339032" + appOrgCode = jdapi.JdVendorOrgCodeFruit } else if beego.BConfig.RunMode == model.ServerTypePet { - appOrgCode = "390558" + appOrgCode = jdapi.JdVendorOrgCodePet } else { - appOrgCode = "320406" + appOrgCode = jdapi.JdVendorOrgCodeVagetable } var ( apijd = apimanager.CurAPIManager.GetAPI(model.VendorIDJD, appOrgCode).(*jdapi.API) @@ -3542,12 +3542,12 @@ func GetSkuNamesNew(ctx *jxcontext.Context, keyword string, skuIDs, skuNameIDs [ t2.id sku_id FROM sku_name t1 LEFT JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = ? - LEFT JOIN thing_map t3 ON t3.thing_id = t2.id AND t3.thing_type = ? AND t3.vendor_org_code = ? AND t3.deleted_at = ? + LEFT JOIN thing_map t3 ON t3.thing_id = t2.id AND t3.thing_type = ? AND t3.vendor_org_code IN (?,?,?) AND t3.deleted_at = ? WHERE t1.deleted_at = ? ` } sqlParams := []interface{}{ - utils.DefaultTimeValue, utils.DefaultTimeValue, model.ThingTypeSku, "320406", utils.DefaultTimeValue, + utils.DefaultTimeValue, utils.DefaultTimeValue, model.ThingTypeSku, "320406", "390558", "339032", utils.DefaultTimeValue, } if keyword != "" { keywordLike := "%" + keyword + "%" diff --git a/business/partner/purchase/jd/sku2.go b/business/partner/purchase/jd/sku2.go index c33b4ce18..ad5d35122 100644 --- a/business/partner/purchase/jd/sku2.go +++ b/business/partner/purchase/jd/sku2.go @@ -2,6 +2,8 @@ package jd import ( "fmt" + "git.rosy.net.cn/jx-callback/globals/api/apimanager" + beego "github.com/astaxie/beego/server/web" "strings" "git.rosy.net.cn/baseapi/platformapi/jdapi" @@ -13,7 +15,6 @@ import ( "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/globals" - "git.rosy.net.cn/jx-callback/globals/api" //beego "github.com/astaxie/beego/server/web" ) @@ -114,7 +115,16 @@ func (p *PurchaseHandler) ReorderCategories2(ctx *jxcontext.Context, vendorOrgCo func (p *PurchaseHandler) getVendorCategories(level int, pid int64) (vendorCats []*model.SkuVendorCategory, err error) { // 得到平台的分类，不需要指定分账号 - cats, err := api.JdAPI.QueryChildCategoriesForOP(pid) + vendorOrgCode := "" + if beego.BConfig.RunMode == model.ServerTypeFruits { + vendorOrgCode = jdapi.JdVendorOrgCodeFruit + } else if beego.BConfig.RunMode == model.ServerTypePet { + vendorOrgCode = jdapi.JdVendorOrgCodePet + } else { + vendorOrgCode = jdapi.JdVendorOrgCodeVagetable + } + jdsApi := apimanager.CurAPIManager.GetAPI(model.VendorIDJD, vendorOrgCode).(*jdapi.API) + cats, err := jdsApi.QueryChildCategoriesForOP(pid) if err != nil { return nil, err } diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index 47668b610..b43041a08 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -5,6 +5,7 @@ import ( "errors" "fmt" product_addV2_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/product_addV2/response" + beego "github.com/astaxie/beego/server/web" "strings" "time" "unicode" @@ -584,7 +585,15 @@ func getTiktokBrandId(api *tiktokShop.API, db *dao.DaoDB, upc, upcBrandName, upc } func getBrandByBrandName(upcCode string) (string, error) { - apijd := apimanager.CurAPIManager.GetAPI(model.VendorIDJD, "320406").(*jdapi.API) + vendorOrgCode := "" + if beego.BConfig.RunMode == model.ServerTypeFruits { + vendorOrgCode = jdapi.JdVendorOrgCodeFruit + } else if beego.BConfig.RunMode == model.ServerTypePet { + vendorOrgCode = jdapi.JdVendorOrgCodePet + } else { + vendorOrgCode = jdapi.JdVendorOrgCodeVagetable + } + apijd := apimanager.CurAPIManager.GetAPI(model.VendorIDJD, vendorOrgCode).(*jdapi.API) result, err := apijd.GetJdUpcCodeByName("", upcCode, 1, 5) if err != nil { return "", err diff --git a/controllers/ebai_callback.go b/controllers/ebai_callback.go index cd65c970d..c11b1792b 100644 --- a/controllers/ebai_callback.go +++ b/controllers/ebai_callback.go @@ -1,13 +1,12 @@ package controllers import ( - "fmt" - "git.rosy.net.cn/baseapi/platformapi/dingdingapi" + "encoding/json" "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/business/jxutils/ddmsg" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/globals" + "io/ioutil" "net/http" "strings" @@ -36,7 +35,7 @@ func (c *EbaiController) Msg() { case model.ServerTypeFruits: callbackResponse = c.EBaiMsgPush2FruitsOrPet(model.ServerTypePet, utils.Struct2Map(obj, "", false)) case model.ServerTypePet: - ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "47B1E94E8D2411EFB666525400E86DC0", "饿了么菜市推果园,果园退超市未找到门店", fmt.Sprintf("cmd:%s,storeId:%s", obj.Cmd, vendorStoreId)) + //ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "47B1E94E8D2411EFB666525400E86DC0", "饿了么菜市推果园,果园退超市未找到门店", fmt.Sprintf("饿了么菜市推果园cmd:%s,storeId:%s", obj.Cmd, vendorStoreId)) callbackResponse = api.EbaiAPI.Err2CallbackResponse(ebaiapi.GetCmd(c.Ctx.Request), nil, nil) // api.EbaiAPI.Err2CallbackResponse(ebaiapi.GetCmd(c.Ctx.Request), fmt.Errorf("饿了么菜市推果园,果园退超市未找到门店cmd:%s,storeId:%s", obj.Cmd, vendorStoreId), nil) return } @@ -64,17 +63,23 @@ func (c *EbaiController) EBaiMsgPush2FruitsOrPet(serverType string, msg map[stri switch serverType { case model.ServerTypeFruits: request, err = http.NewRequest(http.MethodPost, "http://callback-jxgy.jxc4.com/ebai/msg", strings.NewReader(utils.Map2URLValues(msg).Encode())) - if err != nil { - return api.EbaiAPI.Err2CallbackResponse(ebaiapi.GetCmd(c.Ctx.Request), err, nil) - } case model.ServerTypePet: request, err = http.NewRequest(http.MethodPost, "http://callback-gblm.jxc4.com/mtps/status", strings.NewReader(utils.Map2URLValues(msg).Encode())) - if err != nil { - return api.EbaiAPI.Err2CallbackResponse(ebaiapi.GetCmd(c.Ctx.Request), err, nil) - } + } + if err != nil { + return api.EbaiAPI.Err2CallbackResponse(ebaiapi.GetCmd(c.Ctx.Request), err, nil) } - request.Header.Set("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8") - _, err = cl.Do(request) - return api.EbaiAPI.Err2CallbackResponse(ebaiapi.GetCmd(c.Ctx.Request), err, nil) + request.Header.Set("Content-Type", "application/x-www-form-urlencoded") + request.Header.Set("accept", "application/json, text/plain, */*") + resp, err := cl.Do(request) + if err != nil { + return api.EbaiAPI.Err2CallbackResponse(ebaiapi.GetCmd(c.Ctx.Request), err, nil) + } + defer resp.Body.Close() + byteData, _ := ioutil.ReadAll(resp.Body) + result := ebaiapi.CallbackResponse{} + json.Unmarshal(byteData, &result) + + return &result } diff --git a/controllers/mtwm_callback.go b/controllers/mtwm_callback.go index 98c4eb048..a9d981600 100644 --- a/controllers/mtwm_callback.go +++ b/controllers/mtwm_callback.go @@ -2,7 +2,6 @@ package controllers import ( "encoding/json" - "fmt" "git.rosy.net.cn/baseapi/platformapi/mtwmapi" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/model" @@ -190,10 +189,10 @@ func pushMTWMOrder2GY(value url.Values, msgType string, serverType string) *mtwm return mtwmapi.Err2CallbackResponse(err, "") } defer resp.Body.Close() - byteData, err := ioutil.ReadAll(resp.Body) - if err != nil { - return mtwmapi.Err2CallbackResponse(err, "") - } - fmt.Println(string(byteData)) - return mtwmapi.Err2CallbackResponse(err, "") + byteData, _ := ioutil.ReadAll(resp.Body) + + result := mtwmapi.CallbackResponse{} + json.Unmarshal(byteData, &result) + + return &result }