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:
邹宗楠
2025-01-06 14:34:52 +08:00
parent e802a3eebc
commit c73357624e
6 changed files with 57 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/jxcallback/orderman/orderman_ext.go
View File

@@ -1687,11 +1687,11 @@ func RefreshJdShopOrdersEarningPrice(ctx *jxcontext.Context, orderStartTime, ord
appOrgCode string appOrgCode string
) )
if beego.BConfig.RunMode == model.ServerTypeFruits { if beego.BConfig.RunMode == model.ServerTypeFruits {
appOrgCode = "339032" appOrgCode = jdapi.JdVendorOrgCodeFruit
} else if beego.BConfig.RunMode == model.ServerTypePet { } else if beego.BConfig.RunMode == model.ServerTypePet {
appOrgCode = "390558" appOrgCode = jdapi.JdVendorOrgCodePet
} else { } else {
appOrgCode = "320406" appOrgCode = jdapi.JdVendorOrgCodeVagetable
} }
jdapi := partner.CurAPIManager.GetAPI(model.VendorIDJD, appOrgCode).(*jdapi.API) 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) results, err := jdapi.GetJdShopOrders(utils.Str2Time(orderStartTime).Format("20060102"), utils.Str2Time(orderEndTime).Format("20060102"), globals.JdOrgCode, globals.JdLoginName)

16
business/jxstore/cms/sku.go
View File

@@ -1162,11 +1162,11 @@ func getCategoryByName(name string) string {
handler, _ := partner.GetPurchasePlatformFromVendorID(model.VendorIDJD).(partner.IPurchasePlatformStoreSkuHandler) handler, _ := partner.GetPurchasePlatformFromVendorID(model.VendorIDJD).(partner.IPurchasePlatformStoreSkuHandler)
vendorOrgCode := "" vendorOrgCode := ""
if beego.BConfig.RunMode == model.ServerTypeFruits { if beego.BConfig.RunMode == model.ServerTypeFruits {
vendorOrgCode = "339032" vendorOrgCode = jdapi.JdVendorOrgCodeFruit
} else if beego.BConfig.RunMode == model.ServerTypePet { } else if beego.BConfig.RunMode == model.ServerTypePet {
vendorOrgCode = "390558" vendorOrgCode = jdapi.JdVendorOrgCodePet
} else { } else {
vendorOrgCode = "320406" vendorOrgCode = jdapi.JdVendorOrgCodeVagetable
} }
vendorCategoryId, _ := handler.GetSkuCategoryIdByName(vendorOrgCode, name) vendorCategoryId, _ := handler.GetSkuCategoryIdByName(vendorOrgCode, name)
return vendorCategoryId 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) { func GetJdUpcCodeByName(ctx *jxcontext.Context, name, upcCode string) (productInfos []*jdapi.ProductInfo, err error) {
appOrgCode := "" appOrgCode := ""
if beego.BConfig.RunMode == model.ServerTypeFruits { if beego.BConfig.RunMode == model.ServerTypeFruits {
appOrgCode = "339032" appOrgCode = jdapi.JdVendorOrgCodeFruit
} else if beego.BConfig.RunMode == model.ServerTypePet { } else if beego.BConfig.RunMode == model.ServerTypePet {
appOrgCode = "390558" appOrgCode = jdapi.JdVendorOrgCodePet
} else { } else {
appOrgCode = "320406" appOrgCode = jdapi.JdVendorOrgCodeVagetable
} }
var ( var (
apijd = apimanager.CurAPIManager.GetAPI(model.VendorIDJD, appOrgCode).(*jdapi.API) 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 t2.id sku_id
FROM sku_name t1 FROM sku_name t1
LEFT JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = ? 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 = ? WHERE t1.deleted_at = ?
` `
} }
sqlParams := []interface{}{ sqlParams := []interface{}{
utils.DefaultTimeValue, utils.DefaultTimeValue, model.ThingTypeSku, "320406", utils.DefaultTimeValue, utils.DefaultTimeValue, utils.DefaultTimeValue, model.ThingTypeSku, "320406", "390558", "339032", utils.DefaultTimeValue,
} }
if keyword != "" { if keyword != "" {
keywordLike := "%" + keyword + "%" keywordLike := "%" + keyword + "%"

14
business/partner/purchase/jd/sku2.go
View File

@@ -2,6 +2,8 @@ package jd
import ( import (
"fmt" "fmt"
"git.rosy.net.cn/jx-callback/globals/api/apimanager"
beego "github.com/astaxie/beego/server/web"
"strings" "strings"
"git.rosy.net.cn/baseapi/platformapi/jdapi" "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/model/dao"
"git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
//beego "github.com/astaxie/beego/server/web" //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) { 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 { if err != nil {
return nil, err return nil, err
} }

11
business/partner/purchase/tiktok_store/store_sku2_utils.go
View File

@@ -5,6 +5,7 @@ import (
"errors" "errors"
"fmt" "fmt"
product_addV2_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/product_addV2/response" 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" "strings"
"time" "time"
"unicode" "unicode"
@@ -584,7 +585,15 @@ func getTiktokBrandId(api *tiktokShop.API, db *dao.DaoDB, upc, upcBrandName, upc
} }
func getBrandByBrandName(upcCode string) (string, error) { 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) result, err := apijd.GetJdUpcCodeByName("", upcCode, 1, 5)
if err != nil { if err != nil {
return "", err return "", err

25
controllers/ebai_callback.go
View File

@@ -1,13 +1,12 @@
package controllers package controllers
import ( import (
"fmt" "encoding/json"
"git.rosy.net.cn/baseapi/platformapi/dingdingapi"
"git.rosy.net.cn/baseapi/utils" "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"
"git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals"
"io/ioutil"
"net/http" "net/http"
"strings" "strings"
@@ -36,7 +35,7 @@ func (c *EbaiController) Msg() {
case model.ServerTypeFruits: case model.ServerTypeFruits:
callbackResponse = c.EBaiMsgPush2FruitsOrPet(model.ServerTypePet, utils.Struct2Map(obj, "", false)) callbackResponse = c.EBaiMsgPush2FruitsOrPet(model.ServerTypePet, utils.Struct2Map(obj, "", false))
case model.ServerTypePet: 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) 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 return
} }
@@ -64,17 +63,23 @@ func (c *EbaiController) EBaiMsgPush2FruitsOrPet(serverType string, msg map[stri
switch serverType { switch serverType {
case model.ServerTypeFruits: case model.ServerTypeFruits:
request, err = http.NewRequest(http.MethodPost, "http://callback-jxgy.jxc4.com/ebai/msg", strings.NewReader(utils.Map2URLValues(msg).Encode())) 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: case model.ServerTypePet:
request, err = http.NewRequest(http.MethodPost, "http://callback-gblm.jxc4.com/mtps/status", strings.NewReader(utils.Map2URLValues(msg).Encode())) request, err = http.NewRequest(http.MethodPost, "http://callback-gblm.jxc4.com/mtps/status", strings.NewReader(utils.Map2URLValues(msg).Encode()))
}
if err != nil { if err != nil {
return api.EbaiAPI.Err2CallbackResponse(ebaiapi.GetCmd(c.Ctx.Request), 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") request.Header.Set("Content-Type", "application/x-www-form-urlencoded")
_, err = cl.Do(request) 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) 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
} }

13
controllers/mtwm_callback.go
View File

@@ -2,7 +2,6 @@ package controllers
import ( import (
"encoding/json" "encoding/json"
"fmt"
"git.rosy.net.cn/baseapi/platformapi/mtwmapi" "git.rosy.net.cn/baseapi/platformapi/mtwmapi"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/model" "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, "") return mtwmapi.Err2CallbackResponse(err, "")
} }
defer resp.Body.Close() defer resp.Body.Close()
byteData, err := ioutil.ReadAll(resp.Body) byteData, _ := ioutil.ReadAll(resp.Body)
if err != nil {
return mtwmapi.Err2CallbackResponse(err, "") result := mtwmapi.CallbackResponse{}
} json.Unmarshal(byteData, &result)
fmt.Println(string(byteData))
return mtwmapi.Err2CallbackResponse(err, "") return &result
} }