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-03 09:21:52 +08:00
parent b7947a1869
commit 7c313ecca8
3 changed files with 34 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
business/jxstore/cms/system_store_sku.go
View File

@@ -207,35 +207,35 @@ func CopyMtToMT(ctx *jxcontext.Context, fromStore, toStore *dao.StoreDetail, isA
switch step { switch step {
case 1: case 1:
// 同步分类 // 同步分类
fromCategoryList, err := fromApi.RetailCatList(fromStore.VendorStoreID) //fromCategoryList, err := fromApi.RetailCatList(fromStore.VendorStoreID)
if len(fromCategoryList) == model.NO { //if len(fromCategoryList) == model.NO {
return nil, err
}
//toCategoryList, err := toApi.RetailCatList(toStore.VendorStoreID)
//if err != nil {
// return nil, err // return nil, err
//} //}
for _, v := range fromCategoryList { ////toCategoryList, err := toApi.RetailCatList(toStore.VendorStoreID)
categoryErr := toApi.RetailCatUpdate(toStore.VendorStoreID, v.Name, &mtwmapi.Param4UpdateCat{ ////if err != nil {
CategoryCode: v.Code, //// return nil, err
Sequence: v.Sequence, ////}
}) //for _, v := range fromCategoryList {
if categoryErr != nil { // categoryErr := toApi.RetailCatUpdate(toStore.VendorStoreID, v.Name, &mtwmapi.Param4UpdateCat{
globals.SugarLogger.Debugf("err := RetailCatUpdate : %v", categoryErr) // CategoryCode: v.Code,
} // Sequence: v.Sequence,
if v.Children != nil && len(v.Children) != 0 { // })
for _, c := range v.Children { // if categoryErr != nil {
if err3 := toApi.RetailCatUpdate(toStore.VendorStoreID, v.Name, &mtwmapi.Param4UpdateCat{ // globals.SugarLogger.Debugf("err := RetailCatUpdate : %v", categoryErr)
CategoryNameOrigin: v.Name, // }
SecondaryCategoryCode: c.Code, // if v.Children != nil && len(v.Children) != 0 {
SecondaryCategoryName: c.Name, // for _, c := range v.Children {
Sequence: c.Sequence, // if err3 := toApi.RetailCatUpdate(toStore.VendorStoreID, v.Name, &mtwmapi.Param4UpdateCat{
}); err3 != nil { // CategoryNameOrigin: v.Name,
globals.SugarLogger.Debugf("err := RetailCatUpdate Children : %v", err3) // SecondaryCategoryCode: c.Code,
} // SecondaryCategoryName: c.Name,
} // Sequence: c.Sequence,
} // }); err3 != nil {
} // globals.SugarLogger.Debugf("err := RetailCatUpdate Children : %v", err3)
// }
// }
// }
//}
case 2: case 2:
i := offSet i := offSet
@@ -330,7 +330,7 @@ func BatchInitSkuMT2MT(ctx *jxcontext.Context, fromSku []*mtwmapi.AppFood, toApi
} }
}*/ }*/
//mapSkuList["available_times"] = string(salesCycle) //mapSkuList["available_times"] = string(salesCycle)
mapSkuList["available_times"] = v.AvailableTimes //mapSkuList["available_times"] = v.AvailableTimes
//if v.MinOrderCount != "" { //if v.MinOrderCount != "" {
// mapSkuList["min_order_count"] = utils.Str2Int(v.MinOrderCount) // mapSkuList["min_order_count"] = utils.Str2Int(v.MinOrderCount)
//} //}
@@ -362,13 +362,9 @@ func BatchInitSkuMT2MT(ctx *jxcontext.Context, fromSku []*mtwmapi.AppFood, toApi
//todo 增加商品必填属性 //todo 增加商品必填属性
//foodData["common_attr_value"] = storeSku.CommonAttrValue //foodData["common_attr_value"] = storeSku.CommonAttrValue
if categoryCode := utils.Interface2Int64WithDefault(foodData["category_code"], 0); categoryCode != 0 { commonAttrValue, err := createCommonAttrValue(toApi, utils.Interface2Int64WithDefault(foodData["category_code"], 0), utils.Interface2String(foodData["name"]))
commonAttrValue, err := createCommonAttrValue(toApi, categoryCode, utils.Interface2String(foodData["name"])) if err == nil {
if err == nil { foodData["common_attr_value"] = commonAttrValue
foodData["common_attr_value"] = commonAttrValue
} else if storeSku.CommonAttrValue != "" && storeSku.CommonAttrValue != "[]" {
foodData["common_attr_value"] = mtwmapi.CommonAttrValueUpdate(storeSku.CommonAttrValue)
}
} else if storeSku.CommonAttrValue != "" && storeSku.CommonAttrValue != "[]" { } else if storeSku.CommonAttrValue != "" && storeSku.CommonAttrValue != "[]" {
foodData["common_attr_value"] = mtwmapi.CommonAttrValueUpdate(storeSku.CommonAttrValue) foodData["common_attr_value"] = mtwmapi.CommonAttrValueUpdate(storeSku.CommonAttrValue)
} }

2
business/model/dao/store.go
View File

@@ -208,7 +208,7 @@ func GetStoreCourierList2(db *DaoDB, storeIDs, vendorIDs []int, status int, audi
} }
func GetStoresMapList2(db *DaoDB, vendorIDs, storeIDs, storeStatuss []int, status, isSync int, pricePack, name, vendorOrgCode string, mustDirty bool) (storeMapList []*model.StoreMap, err error) { func GetStoresMapList2(db *DaoDB, vendorIDs, storeIDs, storeStatuss []int, status, isSync int, pricePack, name, vendorOrgCode string, mustDirty bool) (storeMapList []*model.StoreMap, err error) {
sql := ` sql := `
SELECT t1.* SELECT t1.*
FROM store_map t1 FROM store_map t1
JOIN store t2 ON t2.id = t1.store_id AND t2.deleted_at = ? JOIN store t2 ON t2.id = t1.store_id AND t2.deleted_at = ?

4
controllers/ebai_callback.go
View File

@@ -20,8 +20,8 @@ func (c *EbaiController) Msg() {
if c.Ctx.Input.Method() == http.MethodPost { if c.Ctx.Input.Method() == http.MethodPost {
obj, callbackResponse := api.EbaiAPI.GetCallbackMsg(c.Ctx.Request) obj, callbackResponse := api.EbaiAPI.GetCallbackMsg(c.Ctx.Request)
if callbackResponse == nil { if callbackResponse == nil {
vendorStoreId := obj.Body["platform_shop_id"].(string) vendorStoreId, _ := utils.TryInterface2Int64(obj.Body["platform_shop_id"])
if vendorStoreId != "" { if vendorStoreId != 0 {
//storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreId, model.VendorIDEBAI, "") //storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreId, model.VendorIDEBAI, "")
//if storeDetail == nil { //if storeDetail == nil {
// globals.SugarLogger.Debugf("-----饿百订单非菜市消息推送-%s", utils.Format4Output(obj, false)) // globals.SugarLogger.Debugf("-----饿百订单非菜市消息推送-%s", utils.Format4Output(obj, false))