From a542b8401c83e4791e97bb59d553419ede4a0323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 17 Nov 2022 10:31:09 +0800 Subject: [PATCH 01/12] 1 --- business/jxstore/cms/sync2.go | 3 + business/model/api_config.go | 1 + controllers/tiktok_order.go | 174 ++++++++++++++++++++++++++++++---- 3 files changed, 161 insertions(+), 17 deletions(-) diff --git a/business/jxstore/cms/sync2.go b/business/jxstore/cms/sync2.go index 800ca15cf..a6b2a8018 100644 --- a/business/jxstore/cms/sync2.go +++ b/business/jxstore/cms/sync2.go @@ -724,10 +724,13 @@ func FullSyncVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, store switch step { case 0: _, err = amendAndPruneVendorStuff(ctx, task, storeID, vendorID, vendorOrgCode, false, isContinueWhenError, AmendPruneAll, false) + globals.SugarLogger.Debugf("========err 1 %s", err) case 1: _, err = SyncCategories(ctx, task, []int{vendorID}, []string{vendorOrgCode}, nil, false) + globals.SugarLogger.Debugf("========err 2 %s", err) case 2: _, err = SyncSkus(ctx, task, []int{vendorID}, []string{vendorOrgCode}, nil, nil, false) + globals.SugarLogger.Debugf("========err 3 %s", err) } return retVal, err }, []int{0, 1, 2}) diff --git a/business/model/api_config.go b/business/model/api_config.go index 3a30e7178..e5a26bcf0 100644 --- a/business/model/api_config.go +++ b/business/model/api_config.go @@ -71,6 +71,7 @@ const ( MTWMStorePSWay13 = "0016" //达达快递 MTWMStorePSWay14 = "0033" //E_代送 ) +const BrandIdChengShan = 142 // 成山农场品牌id type VendorInfo struct { Name string `json:"name"` diff --git a/controllers/tiktok_order.go b/controllers/tiktok_order.go index eb7b7dfac..924aa835d 100644 --- a/controllers/tiktok_order.go +++ b/controllers/tiktok_order.go @@ -1,10 +1,12 @@ package controllers import ( + "encoding/json" "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api" "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/partner/purchase/tiktok_store" - "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "github.com/astaxie/beego/server/web" "strings" @@ -30,27 +32,12 @@ func (t *TiktokController) CallbackTiktokOrderMsg() { } // 2.参数解析 - orderStatus, storeMap, resp := api.TiktokStore.CreateOrderCallback(byteList) + orderStatus, resp := api.TiktokStore.CreateOrderCallback(byteList) if resp.Code != 0 { t.Data["json"] = resp t.ServeJSON() return } - globals.SugarLogger.Debugf("storeMap %s", utils.Format4Output(storeMap, false)) - // 判断订单来源(门店所属菜市,果园,其他方) - //for k, _ := range storeMap { - // vendorStoreId := utils.Int64ToStr(k) - // storeDetail, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreId, model.VendorIDDD, "") - // if err != nil { - // globals.SugarLogger.Errorf("门店信息获取失败: %s", err) - // continue - // } - // if storeDetail != nil { - // continue - // } else { - // // 进入这里面就可能是果园或者其他三放的订单了,将当前信息推送过去 - // } - //} for k, v := range orderStatus { for _, callback := range v { @@ -67,3 +54,156 @@ func (t *TiktokController) CallbackTiktokOrderMsg() { t.ServeJSON() } + +func TiktokMsgChange(orderStatus []byte) (map[string][]interface{}, *tiktok_api.CallbackResponse) { + var resp []*tiktok_api.OrderCallback + if err := json.Unmarshal(orderStatus, &resp); err != nil { + return nil, &tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} + } + + callbackResult := make(map[string][]interface{}, 0) + for _, data := range resp { + switch data.Tag { + case tiktok_api.CallbackCreatedOrderMsgTagId: // 创建订单 + create := tiktok_api.CreateOrderData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { + return nil, tiktok_api.CallbackResponseErr(false) + } + callbackResult[tiktok_api.CallbackCreatedOrderMsgTagId] = append(callbackResult[tiktok_api.CallbackCreatedOrderMsgTagId], create) + vendorStoreId := utils.Int64ToStr(create.ShopId) + storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreId, model.VendorIDDD, "") + if storeDetail != nil && storeDetail.Store.ID != 0 && storeDetail.Store.BrandID == model.BrandIdChengShan { // 成山农场订单 + + } else if storeDetail != nil && storeDetail.Store.ID != 0 { // 当前菜市系统订单 + continue + } else { // 果园订单 + + } + case tiktok_api.CallbackPayOrderMsgTagId: // 支付订单 + create := tiktok_api.PayOrderData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { + return nil, tiktok_api.CallbackResponseErr(false) + } + callbackResult[tiktok_api.CallbackPayOrderMsgTagId] = append(callbackResult[tiktok_api.CallbackPayOrderMsgTagId], create) + case tiktok_api.CallbackWaitOrderMsgTagId: // 支付订单待处理(风控审核) + create := tiktok_api.WaitOrderData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { + return nil, tiktok_api.CallbackResponseErr(false) + } + callbackResult[tiktok_api.CallbackWaitOrderMsgTagId] = append(callbackResult[tiktok_api.CallbackWaitOrderMsgTagId], create) + case tiktok_api.CallbackPartGoodsMsgTagId: // 卖家部分发货 + create := tiktok_api.SomeSendOrderData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { + return nil, tiktok_api.CallbackResponseErr(false) + } + callbackResult[tiktok_api.CallbackPartGoodsMsgTagId] = append(callbackResult[tiktok_api.CallbackPartGoodsMsgTagId], create) + case tiktok_api.CallbackPartAllGoodsMsgTagId: // 卖家发货 + create := tiktok_api.BusinessDeliveryData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { + return nil, tiktok_api.CallbackResponseErr(false) + } + callbackResult[tiktok_api.CallbackPartAllGoodsMsgTagId] = append(callbackResult[tiktok_api.CallbackPartAllGoodsMsgTagId], create) + case tiktok_api.CallbackCancelOrderMsgTagId: // 取消订单 + create := tiktok_api.CreateOrderData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { + return nil, tiktok_api.CallbackResponseErr(false) + } + callbackResult[tiktok_api.CallbackCancelOrderMsgTagId] = append(callbackResult[tiktok_api.CallbackCancelOrderMsgTagId], create) + case tiktok_api.CallbackSuccessOrderMsgTagId: // 卖家确认收货时,会自动完成 + create := tiktok_api.SuccessOrderData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { + return nil, tiktok_api.CallbackResponseErr(false) + } + callbackResult[tiktok_api.CallbackSuccessOrderMsgTagId] = append(callbackResult[tiktok_api.CallbackSuccessOrderMsgTagId], create) + case tiktok_api.CallbackWayBillChangeOrderMsgTagId: // 发货物流消息便跟 + create := tiktok_api.WayBillChangeData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { + return nil, tiktok_api.CallbackResponseErr(false) + } + callbackResult[tiktok_api.CallbackWayBillChangeOrderMsgTagId] = append(callbackResult[tiktok_api.CallbackWayBillChangeOrderMsgTagId], create) + case tiktok_api.CallbackReceivingChangeOrderMsgTagId: // 收货地址消息变更(商家审核通过触发) + create := tiktok_api.ReceivingAddressChangeData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { + return nil, tiktok_api.CallbackResponseErr(false) + } + callbackResult[tiktok_api.CallbackReceivingChangeOrderMsgTagId] = append(callbackResult[tiktok_api.CallbackReceivingChangeOrderMsgTagId], create) + case tiktok_api.CallbackChangeMoneyMsgTagId: // 卖家修改订单/运单金额回调 + create := tiktok_api.UpdateAmountChangeData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { + return nil, tiktok_api.CallbackResponseErr(false) + } + callbackResult[tiktok_api.CallbackChangeMoneyMsgTagId] = append(callbackResult[tiktok_api.CallbackChangeMoneyMsgTagId], create) + case tiktok_api.CallbackBusinessRemarkMsgTagId: // 买家收货消息变更(手机,地址,姓名),用户C端修改触发(需要上面审核接口) + create := tiktok_api.BuyerUpdateWayBillData{} + if err := json.Unmarshal([]byte(data.Data), create); err != nil { + return nil, tiktok_api.CallbackResponseErr(false) + } + callbackResult[tiktok_api.CallbackBusinessRemarkMsgTagId] = append(callbackResult[tiktok_api.CallbackBusinessRemarkMsgTagId], create) + case tiktok_api.CallbackApplyUpdateAddressMsgTagId: // 商家修改交易备注回调 + create := tiktok_api.BusinessUpdateRemakeData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { + return nil, tiktok_api.CallbackResponseErr(false) + } + callbackResult[tiktok_api.CallbackApplyUpdateAddressMsgTagId] = append(callbackResult[tiktok_api.CallbackApplyUpdateAddressMsgTagId], create) + case tiktok_api.CallbackSendOrderTimeChangeMsgTagId: // 订单发货时消息变更回调 + create := tiktok_api.AppointmentChangeData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { + return nil, tiktok_api.CallbackResponseErr(false) + } + callbackResult[tiktok_api.CallbackSendOrderTimeChangeMsgTagId] = append(callbackResult[tiktok_api.CallbackSendOrderTimeChangeMsgTagId], create) + /*********下面属于订单退货消息************/ + case tiktok_api.CallbackRefundOrderMsgTagId: // 买家发起售后申请消息 + create := tiktok_api.BuyerRefundCreatedData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { + return nil, tiktok_api.CallbackResponseErr(false) + } + callbackResult[tiktok_api.CallbackRefundOrderMsgTagId] = append(callbackResult[tiktok_api.CallbackRefundOrderMsgTagId], create) + case tiktok_api.CallbackUpdateRefundOrderMsgTagId: // 买家修改售后申请消息 + create := tiktok_api.BuyerRefundModifiedData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { + return nil, tiktok_api.CallbackResponseErr(false) + } + callbackResult[tiktok_api.CallbackUpdateRefundOrderMsgTagId] = append(callbackResult[tiktok_api.CallbackUpdateRefundOrderMsgTagId], create) + case tiktok_api.CallbackRefundOrderSuccessMsgTagId: // 退款成功消息 + create := tiktok_api.BusinessRefundSuccessData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { + return nil, tiktok_api.CallbackResponseErr(false) + } + callbackResult[tiktok_api.CallbackRefundOrderSuccessMsgTagId] = append(callbackResult[tiktok_api.CallbackRefundOrderSuccessMsgTagId], create) + case tiktok_api.CallbackRefundOrderRefuseMsgTagId: // 拒绝退款消息 + create := tiktok_api.BusinessNotRefundRefusedData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { + return nil, tiktok_api.CallbackResponseErr(false) + } + callbackResult[tiktok_api.CallbackRefundOrderRefuseMsgTagId] = append(callbackResult[tiktok_api.CallbackRefundOrderRefuseMsgTagId], create) + case tiktok_api.CallbackRefundShopMsgTagId: // 拒绝退货申请消息 + create := tiktok_api.BusinessNotReturnApplyRefusedData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { + return nil, tiktok_api.CallbackResponseErr(false) + } + callbackResult[tiktok_api.CallbackRefundShopMsgTagId] = append(callbackResult[tiktok_api.CallbackRefundShopMsgTagId], create) + case tiktok_api.CallbackReturnApplyAgreedMsgTagId: // 卖家同意时，推送此消息 + create := tiktok_api.BusinessReturnApplyAgreedData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { + return nil, tiktok_api.CallbackResponseErr(false) + } + callbackResult[tiktok_api.CallbackReturnApplyAgreedMsgTagId] = append(callbackResult[tiktok_api.CallbackReturnApplyAgreedMsgTagId], create) + case tiktok_api.CallbackReturnRefundAgreedMsgTagId: // 同意退款消息 + create := tiktok_api.BusinessRefundAgreedData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { + return nil, tiktok_api.CallbackResponseErr(false) + } + callbackResult[tiktok_api.CallbackReturnRefundAgreedMsgTagId] = append(callbackResult[tiktok_api.CallbackReturnRefundAgreedMsgTagId], create) + case tiktok_api.CallbackRefundClosedMsgTagId: + create := tiktok_api.UserCancelRefundOrderData{} + if err := json.Unmarshal([]byte(data.Data), &create); err != nil { + return nil, tiktok_api.CallbackResponseErr(false) + } + callbackResult[tiktok_api.CallbackRefundClosedMsgTagId] = append(callbackResult[tiktok_api.CallbackRefundClosedMsgTagId], create) + default: + return nil, tiktok_api.CallbackResponseErr(false) + } + } + + return callbackResult, &tiktok_api.CallbackResponse{Code: tiktok_api.CallbackSuccessCode, Msg: tiktok_api.CallbackSuccess} +} From 68c62458805c779d6806b516dbf2d30ab0552d8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 17 Nov 2022 10:48:40 +0800 Subject: [PATCH 02/12] 1 --- business/jxstore/cms/sync2.go | 4 ++++ business/model/dao/sku.go | 2 ++ 2 files changed, 6 insertions(+) diff --git a/business/jxstore/cms/sync2.go b/business/jxstore/cms/sync2.go index a6b2a8018..9c27998a4 100644 --- a/business/jxstore/cms/sync2.go +++ b/business/jxstore/cms/sync2.go @@ -42,6 +42,7 @@ func getMultiStoreVendorInfoList() (list []*MultiStoreVendorInfo) { } func syncCategories(ctx *jxcontext.Context, db *dao.DaoDB, parentTask tasksch.ITask, catList []*dao.SkuStoreCatInfo, isAsync bool) (hint string, err error) { + defer globals.SugarLogger.Debugf("syncCategories err := %s", err) if len(catList) > 0 { // todo 按vendorID orgCode合并操作 task := tasksch.NewParallelTask(fmt.Sprintf("同步分类2:%d", len(catList)), tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, @@ -95,6 +96,7 @@ func syncCategories(ctx *jxcontext.Context, db *dao.DaoDB, parentTask tasksch.IT } func SyncCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorIDs []int, appOrgCodes []string, catIDs []int, isAsync bool) (hint string, err error) { + defer globals.SugarLogger.Debugf("SyncCategories err := %s", err) db := dao.GetDB() catList, err := dao.GetSkuCategoryWithVendor(db, vendorIDs, appOrgCodes, -1, catIDs, true) if err == nil && len(catList) > 0 { @@ -139,6 +141,7 @@ func SyncCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorIDs } func SyncSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorIDs []int, appOrgCodes []string, nameIDs, skuIDs []int, isAsync bool) (hint string, err error) { + defer globals.SugarLogger.Debugf("SyncSkus err := %s", err) db := dao.GetDB() skuList, err := dao.GetSkusWithVendor(db, vendorIDs, appOrgCodes, nameIDs, skuIDs, true) @@ -535,6 +538,7 @@ func updateThingMapEntity(db *dao.DaoDB, thingMap *model.ThingMap) { } func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID, vendorID int, vendorOrgCode string, isAsync, isContinueWhenError bool, opType int, isForceUpdate bool) (hint string, err error) { + defer globals.SugarLogger.Debugf("amendAndPruneVendorStuff err := %s", err) handler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IMultipleStoresHandler) if handler == nil { return "", fmt.Errorf("平台:%s不支持此操作", model.VendorChineseNames[vendorID]) diff --git a/business/model/dao/sku.go b/business/model/dao/sku.go index 2c0033b68..68e43698d 100644 --- a/business/model/dao/sku.go +++ b/business/model/dao/sku.go @@ -1,6 +1,7 @@ package dao import ( + "git.rosy.net.cn/jx-callback/globals" "time" "git.rosy.net.cn/baseapi/platformapi/aliupcapi" @@ -227,6 +228,7 @@ func GetSkuByCats(db *DaoDB, catIDs []int) (skuList []*model.Sku, err error) { // 多门店平台使用，当前只有京东 func GetSkuCategoryWithVendor(db *DaoDB, vendorIDs []int, appOrgCodes []string, parentCatID int, catIDs []int, mustDirty bool) (catList []*SkuStoreCatInfo, err error) { + defer globals.SugarLogger.Debugf("GetSkuCategoryWithVendor err := %s", err) sqlParams := []interface{}{} sql := ` SELECT From 0a2397437b476663311e4e6853599a0172330180 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 17 Nov 2022 11:04:31 +0800 Subject: [PATCH 03/12] 1 --- business/jxstore/cms/sync2.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/business/jxstore/cms/sync2.go b/business/jxstore/cms/sync2.go index 9c27998a4..0ad5643e8 100644 --- a/business/jxstore/cms/sync2.go +++ b/business/jxstore/cms/sync2.go @@ -554,6 +554,7 @@ func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, switch step { case 0: localSkuList, err := dao.GetSkusWithVendor(db, []int{vendorID}, []string{vendorOrgCode}, nil, nil, false) + globals.SugarLogger.Debugf("GetSkusWithVendor err := %s", err) if err != nil { return nil, err } @@ -565,6 +566,7 @@ func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, } remoteSkuList, err2 := handler.GetSkus(ctx, vendorOrgCode, 0, "") + globals.SugarLogger.Debugf("remoteSkuList err := %s", err) if err = err2; err == nil { remoteSkuMap := make(map[string]int) for _, v := range remoteSkuList { @@ -587,6 +589,7 @@ func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, StoreSkuMap := make(map[int]*dao.StoreSkuSyncInfo) if storeID != 0 { skuList2, _ := dao.GetStoreSkuListWithVendor(db, storeID, vendorID, vendorOrgCode) + globals.SugarLogger.Debugf("skuList2 err := %s", err) for _, v := range skuList2 { if _, ok := StoreSkuMap[v.ID]; !ok { StoreSkuMap[v.ID] = v @@ -634,6 +637,7 @@ func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, sku2Delete = nil case 2: localCatList, err := dao.GetSkuCategoryWithVendor(db, []int{vendorID}, []string{vendorOrgCode}, -1, nil, false) + globals.SugarLogger.Debugf("localCatList 2 err := %s", err) if err != nil { return nil, err } From e9638a03ad4b2cf0ad2b9caf8a19f1859cc7348d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 17 Nov 2022 11:16:13 +0800 Subject: [PATCH 04/12] 1 --- business/jxstore/cms/sync2.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/business/jxstore/cms/sync2.go b/business/jxstore/cms/sync2.go index 0ad5643e8..4385394ac 100644 --- a/business/jxstore/cms/sync2.go +++ b/business/jxstore/cms/sync2.go @@ -538,7 +538,6 @@ func updateThingMapEntity(db *dao.DaoDB, thingMap *model.ThingMap) { } func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID, vendorID int, vendorOrgCode string, isAsync, isContinueWhenError bool, opType int, isForceUpdate bool) (hint string, err error) { - defer globals.SugarLogger.Debugf("amendAndPruneVendorStuff err := %s", err) handler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IMultipleStoresHandler) if handler == nil { return "", fmt.Errorf("平台:%s不支持此操作", model.VendorChineseNames[vendorID]) @@ -625,6 +624,7 @@ func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, } } } + globals.SugarLogger.Debugf("case 0 err %s", err) case 1: // if (opType == AmendPruneOnlyPrune || opType == AmendPruneAll) && len(sku2Delete) > 0 { // _, err = putils.FreeBatchStoreSkuInfo("删除商品", func(task tasksch.ITask, batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, successCount int, err error) { @@ -635,6 +635,7 @@ func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, // }, ctx, task, sku2Delete, 1, isContinueWhenError) // } sku2Delete = nil + globals.SugarLogger.Debugf("case 1 err %s", err) case 2: localCatList, err := dao.GetSkuCategoryWithVendor(db, []int{vendorID}, []string{vendorOrgCode}, -1, nil, false) globals.SugarLogger.Debugf("localCatList 2 err := %s", err) @@ -685,6 +686,7 @@ func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, } } } + globals.SugarLogger.Debugf("case 2 err %s", err) case 3: if (opType == AmendPruneOnlyPrune || opType == AmendPruneAll) && len(cat2Delete) > 0 { for i := 0; i < 2; i++ { @@ -709,6 +711,7 @@ func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, } cat2Delete = nil } + globals.SugarLogger.Debugf("case 3 err %s", err) return nil, err }, []int{0, 1, 2, 3}) tasksch.HandleTask(task, parentTask, true).Run() @@ -718,6 +721,7 @@ func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, } else { hint = task.ID } + globals.SugarLogger.Debugf("amendAndPruneVendorStuff err := %s", err) return hint, err } @@ -732,7 +736,7 @@ func FullSyncVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, store switch step { case 0: _, err = amendAndPruneVendorStuff(ctx, task, storeID, vendorID, vendorOrgCode, false, isContinueWhenError, AmendPruneAll, false) - globals.SugarLogger.Debugf("========err 1 %s", err) + globals.SugarLogger.Debugf("=== =====err 1 %s", err) case 1: _, err = SyncCategories(ctx, task, []int{vendorID}, []string{vendorOrgCode}, nil, false) globals.SugarLogger.Debugf("========err 2 %s", err) From baa2d6feba4243aa13a0454f967091ebb6302cc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 17 Nov 2022 11:34:40 +0800 Subject: [PATCH 05/12] 1 --- business/jxstore/cms/sync2.go | 1 + business/model/dao/sku.go | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/business/jxstore/cms/sync2.go b/business/jxstore/cms/sync2.go index 4385394ac..3c6bb8c2a 100644 --- a/business/jxstore/cms/sync2.go +++ b/business/jxstore/cms/sync2.go @@ -665,6 +665,7 @@ func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, return 0 } remoteCatList, err2 := handler.GetAllCategories(ctx, vendorOrgCode) + globals.SugarLogger.Debugf("remoteCatList 2 err := %s", err2) if err = err2; err == nil { remoteCatMap := make(map[string]int) cat2Delete = checkRemoteCatExist(remoteCatMap, localCatMap, remoteCatList) diff --git a/business/model/dao/sku.go b/business/model/dao/sku.go index 68e43698d..2c0033b68 100644 --- a/business/model/dao/sku.go +++ b/business/model/dao/sku.go @@ -1,7 +1,6 @@ package dao import ( - "git.rosy.net.cn/jx-callback/globals" "time" "git.rosy.net.cn/baseapi/platformapi/aliupcapi" @@ -228,7 +227,6 @@ func GetSkuByCats(db *DaoDB, catIDs []int) (skuList []*model.Sku, err error) { // 多门店平台使用，当前只有京东 func GetSkuCategoryWithVendor(db *DaoDB, vendorIDs []int, appOrgCodes []string, parentCatID int, catIDs []int, mustDirty bool) (catList []*SkuStoreCatInfo, err error) { - defer globals.SugarLogger.Debugf("GetSkuCategoryWithVendor err := %s", err) sqlParams := []interface{}{} sql := ` SELECT From 00cba24beac21f413644f6cd657bd842f0440ffb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 17 Nov 2022 13:34:41 +0800 Subject: [PATCH 06/12] 1 --- business/jxstore/cms/store.go | 1 - business/jxstore/cms/sync.go | 1 - business/jxstore/cms/sync2.go | 4 ---- business/jxstore/cms/sync_store_sku.go | 2 -- business/partner/purchase/tiktok_store/store_sku2.go | 1 - 5 files changed, 9 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index e1ff3e4ca..92ec703cc 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1522,7 +1522,6 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend return nil, fmt.Errorf("此平台门店ID已在京西有绑定，请先解除绑定，平台门店ID :[%v]", storeMap.VendorStoreID) } if vendorID == model.VendorIDDD { //抖店绑定店铺时 检查并补充创建 - globals.SugarLogger.Debugf("vendorID ==============%d", vendorID) if err2 := tiktok_store.CreateOrUpdateAll(vendorOrgCode, int64(storeMap.StoreID), utils.Str2Int64(storeMap.VendorStoreID), int64(storeMap.DeliveryFeeDeductionFee), utils.Str2Int64(storeMap.YbStorePrefix)); err2 != nil { errList.AddErr(err2) } diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go index 7ee10f510..edb3d227b 100644 --- a/business/jxstore/cms/sync.go +++ b/business/jxstore/cms/sync.go @@ -249,7 +249,6 @@ func (v *VendorSync) SyncStore2(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs db2 = dao.GetDB() } if model.IsSyncStatusNew(storeMap.SyncStatus) { - globals.SugarLogger.Debugf("1.IsSyncStatusNew(storeMap.SyncStatus)") storeDetail, _ := dao.GetStoreDetail(db, storeMap.StoreID, storeMap.VendorID, storeMap.VendorOrgCode) if vendorStoreID, err = handler.CreateStore2(db2, storeMap.StoreID, userName, nil, storeDetail); err == nil { resultList = append(resultList, 1) diff --git a/business/jxstore/cms/sync2.go b/business/jxstore/cms/sync2.go index 3c6bb8c2a..5163fdcb9 100644 --- a/business/jxstore/cms/sync2.go +++ b/business/jxstore/cms/sync2.go @@ -42,7 +42,6 @@ func getMultiStoreVendorInfoList() (list []*MultiStoreVendorInfo) { } func syncCategories(ctx *jxcontext.Context, db *dao.DaoDB, parentTask tasksch.ITask, catList []*dao.SkuStoreCatInfo, isAsync bool) (hint string, err error) { - defer globals.SugarLogger.Debugf("syncCategories err := %s", err) if len(catList) > 0 { // todo 按vendorID orgCode合并操作 task := tasksch.NewParallelTask(fmt.Sprintf("同步分类2:%d", len(catList)), tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, @@ -96,7 +95,6 @@ func syncCategories(ctx *jxcontext.Context, db *dao.DaoDB, parentTask tasksch.IT } func SyncCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorIDs []int, appOrgCodes []string, catIDs []int, isAsync bool) (hint string, err error) { - defer globals.SugarLogger.Debugf("SyncCategories err := %s", err) db := dao.GetDB() catList, err := dao.GetSkuCategoryWithVendor(db, vendorIDs, appOrgCodes, -1, catIDs, true) if err == nil && len(catList) > 0 { @@ -141,7 +139,6 @@ func SyncCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorIDs } func SyncSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorIDs []int, appOrgCodes []string, nameIDs, skuIDs []int, isAsync bool) (hint string, err error) { - defer globals.SugarLogger.Debugf("SyncSkus err := %s", err) db := dao.GetDB() skuList, err := dao.GetSkusWithVendor(db, vendorIDs, appOrgCodes, nameIDs, skuIDs, true) @@ -553,7 +550,6 @@ func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, switch step { case 0: localSkuList, err := dao.GetSkusWithVendor(db, []int{vendorID}, []string{vendorOrgCode}, nil, nil, false) - globals.SugarLogger.Debugf("GetSkusWithVendor err := %s", err) if err != nil { return nil, err } diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index 1ab88174e..6bcdeed26 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -185,7 +185,6 @@ func SyncStoreSkuNew2(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFla case 0: if singleStoreHandler != nil { _, err = SyncStoreCategories(ctx, task, vendorID, storeID, vendorStoreID, nameIDs, skuIDs, false, isContinueWhenError) - globals.SugarLogger.Debugf("SyncStoreCategories in SyncStoreSkuNew2 err on: %s", err) } case 1: err = syncStoreSkuNew(ctx, task, causeFlag, false, vendorID, storeID, vendorOrgCode, nameIDs, skuIDs, excludeSkuIDs, useVendorPriceDirectly, isContinueWhenError) @@ -815,7 +814,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag } case 6: if len(priceList) > 0 { - globals.SugarLogger.Debugf("更新门店商品价格=====") _, err = putils.FreeBatchStoreSkuInfo("更新门店商品价格", func(task tasksch.ITask, batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, successCount int, err error) { if isNeedHandleAct(causeFlag) { cancelStoreSkuActs(ctx, task, vendorID, storeDetail.VendorOrgCode, storeID, vendorStoreID, batchedStoreSkuList, true) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index a7cd0563c..2a0f6e82e 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -205,7 +205,6 @@ func (p *PurchaseHandler) DeleteStoreSkus(ctx *jxcontext.Context, storeID int, v if v.VendorMainId == "" { continue } - globals.SugarLogger.Debugf("=========storeSkuList====:= %s", utils.Format4Output(v, false)) if err = getAPI(storeSkuList[0].VendorOrgCode, storeID, vendorStoreID).DeleteStoreCommodity(utils.Str2Int64(v.VendorMainId)); err != nil { failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "删除主商品")...) } From c642fc4ca1c4058a81c0ccd6a1f355a761f0cbd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 17 Nov 2022 13:49:33 +0800 Subject: [PATCH 07/12] 1 --- business/jxstore/cms/sync2.go | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/business/jxstore/cms/sync2.go b/business/jxstore/cms/sync2.go index 5163fdcb9..800ca15cf 100644 --- a/business/jxstore/cms/sync2.go +++ b/business/jxstore/cms/sync2.go @@ -561,7 +561,6 @@ func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, } remoteSkuList, err2 := handler.GetSkus(ctx, vendorOrgCode, 0, "") - globals.SugarLogger.Debugf("remoteSkuList err := %s", err) if err = err2; err == nil { remoteSkuMap := make(map[string]int) for _, v := range remoteSkuList { @@ -584,7 +583,6 @@ func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, StoreSkuMap := make(map[int]*dao.StoreSkuSyncInfo) if storeID != 0 { skuList2, _ := dao.GetStoreSkuListWithVendor(db, storeID, vendorID, vendorOrgCode) - globals.SugarLogger.Debugf("skuList2 err := %s", err) for _, v := range skuList2 { if _, ok := StoreSkuMap[v.ID]; !ok { StoreSkuMap[v.ID] = v @@ -620,7 +618,6 @@ func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, } } } - globals.SugarLogger.Debugf("case 0 err %s", err) case 1: // if (opType == AmendPruneOnlyPrune || opType == AmendPruneAll) && len(sku2Delete) > 0 { // _, err = putils.FreeBatchStoreSkuInfo("删除商品", func(task tasksch.ITask, batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, successCount int, err error) { @@ -631,10 +628,8 @@ func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, // }, ctx, task, sku2Delete, 1, isContinueWhenError) // } sku2Delete = nil - globals.SugarLogger.Debugf("case 1 err %s", err) case 2: localCatList, err := dao.GetSkuCategoryWithVendor(db, []int{vendorID}, []string{vendorOrgCode}, -1, nil, false) - globals.SugarLogger.Debugf("localCatList 2 err := %s", err) if err != nil { return nil, err } @@ -661,7 +656,6 @@ func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, return 0 } remoteCatList, err2 := handler.GetAllCategories(ctx, vendorOrgCode) - globals.SugarLogger.Debugf("remoteCatList 2 err := %s", err2) if err = err2; err == nil { remoteCatMap := make(map[string]int) cat2Delete = checkRemoteCatExist(remoteCatMap, localCatMap, remoteCatList) @@ -683,7 +677,6 @@ func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, } } } - globals.SugarLogger.Debugf("case 2 err %s", err) case 3: if (opType == AmendPruneOnlyPrune || opType == AmendPruneAll) && len(cat2Delete) > 0 { for i := 0; i < 2; i++ { @@ -708,7 +701,6 @@ func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, } cat2Delete = nil } - globals.SugarLogger.Debugf("case 3 err %s", err) return nil, err }, []int{0, 1, 2, 3}) tasksch.HandleTask(task, parentTask, true).Run() @@ -718,7 +710,6 @@ func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, } else { hint = task.ID } - globals.SugarLogger.Debugf("amendAndPruneVendorStuff err := %s", err) return hint, err } @@ -733,13 +724,10 @@ func FullSyncVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, store switch step { case 0: _, err = amendAndPruneVendorStuff(ctx, task, storeID, vendorID, vendorOrgCode, false, isContinueWhenError, AmendPruneAll, false) - globals.SugarLogger.Debugf("=== =====err 1 %s", err) case 1: _, err = SyncCategories(ctx, task, []int{vendorID}, []string{vendorOrgCode}, nil, false) - globals.SugarLogger.Debugf("========err 2 %s", err) case 2: _, err = SyncSkus(ctx, task, []int{vendorID}, []string{vendorOrgCode}, nil, nil, false) - globals.SugarLogger.Debugf("========err 3 %s", err) } return retVal, err }, []int{0, 1, 2}) From 93e7cb9c4f7037aa4f32be9201e61a112f75ed04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 17 Nov 2022 15:41:31 +0800 Subject: [PATCH 08/12] 1 --- business/jxstore/cms/sync_store_sku.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index 6bcdeed26..a23bb6605 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -450,6 +450,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag } else { skus, err = dao.GetStoreSkus(db, vendorID, storeID, skuIDs) } + globals.SugarLogger.Debugf("skus := %s", utils.Format4Output(skus, false)) if err != nil || len(skus) == 0 { return err @@ -676,6 +677,15 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag // } } + globals.SugarLogger.Debugf("==============createList=%s", utils.Format4Output(createList, false)) + globals.SugarLogger.Debugf("===============updateList%s", utils.Format4Output(updateList, false)) + globals.SugarLogger.Debugf("==============deleteList=%s", utils.Format4Output(deleteList, false)) + globals.SugarLogger.Debugf("===============priceList%s", utils.Format4Output(priceList, false)) + globals.SugarLogger.Debugf("===============stockList%s", utils.Format4Output(stockList, false)) + globals.SugarLogger.Debugf("==============onlineList=%s", utils.Format4Output(onlineList, false)) + globals.SugarLogger.Debugf("===============offlineList %s", utils.Format4Output(offlineList, false)) + globals.SugarLogger.Debugf("===============offlineList %s", utils.Format4Output(offlineList, false)) + task := tasksch.NewParallelTask("syncStoreSkuNew", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError2), ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { step := batchItemList[0].(int) From fa7798b0bf30f539682fe570090c037899e823c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 17 Nov 2022 15:47:16 +0800 Subject: [PATCH 09/12] 1 --- business/model/dao/store_sku.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index 64fbf4f34..be3cf628f 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -688,6 +688,8 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo sql = fmt.Sprintf(sql, fmtParams...) sql += " ORDER BY t1.price" + globals.SugarLogger.Debugf("===========sql := %s", sql) + globals.SugarLogger.Debugf("===========sql := %s", utils.Format4Output(sqlParams, false)) if err = GetRows(db, &skus, sql, sqlParams...); err != nil { return nil, err } From 8dd40167590d819c2d4c527b243721ad8635aff7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 17 Nov 2022 16:31:14 +0800 Subject: [PATCH 10/12] 1 --- business/jxstore/cms/sync_store_sku.go | 7 +++++-- business/model/dao/store_sku.go | 2 -- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index a23bb6605..bc46ae2ea 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -450,8 +450,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag } else { skus, err = dao.GetStoreSkus(db, vendorID, storeID, skuIDs) } - globals.SugarLogger.Debugf("skus := %s", utils.Format4Output(skus, false)) - + globals.SugarLogger.Debugf("skus := %d", len(skus)) if err != nil || len(skus) == 0 { return err } @@ -493,12 +492,16 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag sku.VendorPrice = 0 } sku.MergedStatus = MergeSkuSaleStatusWithStoreOpTime(sku, storeDetail, now) + globals.SugarLogger.Debugf("==============1 %d", sku.MergedStatus) if vendorID == model.VendorIDMTWM && storeDetail.Status != model.StoreStatusOpened && storeDetail.AutoEnableAt != nil && storeDetail.AutoEnableAt.Sub(specailAutoEnableAt) == 0 && sku.MergedStatus == model.SkuStatusNormal { sku.MergedStatus = model.SkuStatusDontSale + globals.SugarLogger.Debugf("==============2 %d", sku.MergedStatus) } if sku.Status != model.SkuStatusNormal { sku.MergedStatus = model.SkuStatusDontSale + globals.SugarLogger.Debugf("==============3 %d", sku.MergedStatus) } + globals.SugarLogger.Debugf("==============4 %d", sku.MergedStatus) var bareSku *partner.StoreSkuInfo isNeedReorder := false if isStoreSkuSyncNeedDelete(sku) { diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index be3cf628f..64fbf4f34 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -688,8 +688,6 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo sql = fmt.Sprintf(sql, fmtParams...) sql += " ORDER BY t1.price" - globals.SugarLogger.Debugf("===========sql := %s", sql) - globals.SugarLogger.Debugf("===========sql := %s", utils.Format4Output(sqlParams, false)) if err = GetRows(db, &skus, sql, sqlParams...); err != nil { return nil, err } From 9e41f7b3b452ff1ee2e832c8e0525f5f11da41e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 17 Nov 2022 16:41:24 +0800 Subject: [PATCH 11/12] 1 --- business/model/dao/store_sku.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index 64fbf4f34..be3cf628f 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -688,6 +688,8 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo sql = fmt.Sprintf(sql, fmtParams...) sql += " ORDER BY t1.price" + globals.SugarLogger.Debugf("===========sql := %s", sql) + globals.SugarLogger.Debugf("===========sql := %s", utils.Format4Output(sqlParams, false)) if err = GetRows(db, &skus, sql, sqlParams...); err != nil { return nil, err } From 338b61e2c8d58c87cc387ee9eaa474695a345a2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 17 Nov 2022 16:56:47 +0800 Subject: [PATCH 12/12] 1 --- business/jxstore/cms/sync_store_sku.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index bc46ae2ea..9b388c1da 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -473,7 +473,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag singleStoreHandler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreStoreSkuHandler) storeSkuHandler := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IPurchasePlatformStoreSkuHandler) reorderHandler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IStoreSkuSorter) - + globals.SugarLogger.Debugf("=======singleStoreHandler %s", utils.Format4Output(singleStoreHandler, false)) var ( createList, updateList []*dao.StoreSkuSyncInfo deleteList, stockList, onlineList, offlineList, priceList []*partner.StoreSkuInfo