This commit is contained in:
邹宗楠
2023-02-23 14:27:06 +08:00
parent fcebf15b62
commit 7b18452932
12 changed files with 118 additions and 27 deletions

View File

@@ -2,9 +2,6 @@ package mtwm
import (
"encoding/json"
"regexp"
"strings"
"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils"
@@ -15,6 +12,8 @@ import (
"git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/business/partner/putils"
"git.rosy.net.cn/jx-callback/globals"
"regexp"
"strings"
)
const (
@@ -163,29 +162,29 @@ func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID in
storeCat.CatSyncStatus |= model.SyncFlagNewMask
err = p.CreateStoreCategory(ctx, storeID, vendorStoreID, storeCat)
}
if err != nil && strings.Contains(err.Error(), "门店内存在重复的分类:") {
globals.SugarLogger.Debugf("==========err %s", err.Error())
storeCategoryList, err2 := api.RetailCatList(vendorStoreID)
globals.SugarLogger.Debugf("==========err2 %v", err2)
globals.SugarLogger.Debugf("==========err %s", utils.Format4Output(storeCategoryList, false))
if err2 != nil {
err = err2
} else {
for _, v := range storeCategoryList {
globals.SugarLogger.Debugf("storeCategoryList==========err %s", err.Error())
if len(v.Children) > 0 {
for _, c := range v.Children {
if strings.Contains(c.Name, err.Error()) {
api.RetailCatDelete(vendorStoreID, "", c.Name)
}
}
}
if strings.Contains(v.Name, err.Error()) {
api.RetailCatDelete(vendorStoreID, "", v.Name)
}
}
}
}
//if err != nil && strings.Contains(err.Error(), "门店内存在重复的分类:") {
// globals.SugarLogger.Debugf("==========err %s", err.Error())
// storeCategoryList, err2 := api.RetailCatList(vendorStoreID)
// globals.SugarLogger.Debugf("==========err2 %v", err2)
// globals.SugarLogger.Debugf("==========err %s", utils.Format4Output(storeCategoryList, false))
// if err2 != nil {
// err = err2
// } else {
// for _, v := range storeCategoryList {
// globals.SugarLogger.Debugf("storeCategoryList==========err %s", err.Error())
// if len(v.Children) > 0 {
// for _, c := range v.Children {
// if strings.Contains(c.Name, err.Error()) {
// api.RetailCatDelete(vendorStoreID, "", c.Name)
// }
// }
// }
// if strings.Contains(v.Name, err.Error()) {
// api.RetailCatDelete(vendorStoreID, "", v.Name)
// }
// }
// }
//}
}
if err == nil {
// storeCat.VendorCatID = utils.FilterEmoji(storeCat.Name)