From 54d718bf456392b3797e59382076cb443ca60f16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 28 Oct 2022 17:35:57 +0800 Subject: [PATCH 1/9] 1 --- business/model/store_sku.go | 4 +- .../purchase/tiktok_store/store_sku2.go | 37 +++++++++++-------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/business/model/store_sku.go b/business/model/store_sku.go index 2bd8d067a..210462ab1 100644 --- a/business/model/store_sku.go +++ b/business/model/store_sku.go @@ -115,14 +115,14 @@ type StoreSkuBind struct { // ElmID int64 `orm:"column(elm_id);index"` MtwmID int64 `orm:"column(mtwm_id);index"` EbaiID int64 `orm:"column(ebai_id);index"` - DdID int64 `orm:"column(dd_id);index"` + DdID int64 `orm:"column(dd_id);index"` // 子品主商品id YbID int64 `orm:"column(yb_id);index"` JdsID int64 `orm:"column(jds_id);index"` JdsWareID int64 `orm:"column(jds_ware_id)"` //GmID string `orm:"column(gm_id)"` // WscID int64 `orm:"column(wsc_id);index"` // 表示微盟skuId // WscID2 int64 `orm:"column(wsc_id2);index"` // 表示微盟goodsId - VendorSkuAttrId string `orm:"column(vendor_sku_attr_id)"` // 抖音需要,抖音商品属性id + VendorSkuAttrId string `orm:"column(vendor_sku_attr_id)"` // 抖音需要,主品skuid VendorMainId string `orm:"column(vendor_Main_id)"` // 抖音需要,商品主id // ElmSyncStatus int8 `orm:"default(2)"` diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index c58c17f81..623891586 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -1,6 +1,7 @@ package tiktok_store import ( + "errors" "fmt" "git.rosy.net.cn/baseapi/platformapi/mtwmapi" sku_editPrice_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/sku_editPrice/request" @@ -216,16 +217,16 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOr api := getAPI(vendorOrgCode, storeID, vendorStoreID) if status == model.SkuStatusNormal { // 下架 for _, v := range storeSkuList { - //if err := api.EditStoreCommodityCommit(&product_editV2_commit_request.ProductEditV2Param2{ - // ProductId: utils.Str2Int64(v.VendorSkuID), - // Commit: true, - //}); err != nil { - // failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "下架商品异常")...) - //} else { - // failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "下架商品正常")...) - //} + // 子品商品id获取skuId + childrenSku, err := api.GetSkuDetail(v.VendorSkuID, "") + if err != nil { + return nil, err + } + if len(childrenSku.SpecPrices) <= 0 { + return nil, errors.New("子品商品详情获取失败") + } param := &sku_syncStock_request.SkuSyncStockParam{ - SkuId: utils.Str2Int64(v.VendorSkuAttrId), + SkuId: childrenSku.SpecPrices[0].SkuId, ProductId: utils.Str2Int64(v.VendorSkuID), Incremental: false, IdempotentId: "", @@ -240,14 +241,18 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOr } } else { // 上架 for _, v := range storeSkuList { - //err := api.ProductSetOffline(utils.Str2Int64(v.VendorSkuID)) - //if err == nil { - // failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "下架商品正常")...) - //} else { - // failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "下架商品异常")...) - //} + + // 子品商品id获取skuId + childrenSku, err := api.GetSkuDetail(v.VendorSkuID, "") + if err != nil { + return nil, err + } + if len(childrenSku.SpecPrices) <= 0 { + return nil, errors.New("子品商品详情获取失败") + } + param := &sku_syncStock_request.SkuSyncStockParam{ - SkuId: utils.Str2Int64(v.VendorSkuAttrId), + SkuId: childrenSku.SpecPrices[0].SkuId, ProductId: utils.Str2Int64(v.VendorSkuID), Incremental: false, IdempotentId: "", From 5f6c739db97189ec5475ac35e734e159bf4e1d35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 28 Oct 2022 18:26:08 +0800 Subject: [PATCH 2/9] 1 --- business/partner/partner.go | 7 +-- business/partner/purchase/ebai/order_afs.go | 3 ++ business/partner/purchase/mtwm/order_afs.go | 3 ++ .../purchase/tiktok_store/order_afs.go | 4 +- .../purchase/tiktok_store/store_sku2.go | 53 +++++++++---------- 5 files changed, 39 insertions(+), 31 deletions(-) diff --git a/business/partner/partner.go b/business/partner/partner.go index 63d4b1418..98a6fee64 100644 --- a/business/partner/partner.go +++ b/business/partner/partner.go @@ -27,9 +27,10 @@ const ( ) const ( - AfsApproveTypeRefund = 1 // 退款 - AfsApproveTypeReturnGoods = 2 // 退货 - AfsApproveTypeRefused = 3 // 驳回 + AfsApproveTypeRefund = 1 // 同意退款 + AfsApproveTypeReturnGoods = 2 // 退货退款 + AfsApproveTypeRefused = 3 // 驳回退款 + AfsApproveTypeRefusedToRefundMoney = 4 // 退货转退款 ) const ( diff --git a/business/partner/purchase/ebai/order_afs.go b/business/partner/purchase/ebai/order_afs.go index 9149dbfe2..33af86e67 100644 --- a/business/partner/purchase/ebai/order_afs.go +++ b/business/partner/purchase/ebai/order_afs.go @@ -1,6 +1,7 @@ package ebai import ( + "errors" "fmt" "strings" @@ -225,6 +226,8 @@ func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *mod if globals.EnableEbaiStoreWrite { if approveType == partner.AfsApproveTypeRefused { err = api.EbaiAPI.OrderDisagreeReturnGoods(order.VendorOrderID, order.AfsOrderID, reason) + } else if approveType == partner.AfsApproveTypeRefusedToRefundMoney { + return errors.New("此平台暂时不支持") } else { err = api.EbaiAPI.OrderAgreeReturnGoods(order.VendorOrderID, order.AfsOrderID) } diff --git a/business/partner/purchase/mtwm/order_afs.go b/business/partner/purchase/mtwm/order_afs.go index e68c3923c..ccbc1c9a8 100644 --- a/business/partner/purchase/mtwm/order_afs.go +++ b/business/partner/purchase/mtwm/order_afs.go @@ -1,6 +1,7 @@ package mtwm import ( + "errors" "fmt" "git.rosy.net.cn/jx-callback/globals/api" "net/url" @@ -196,6 +197,8 @@ func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *mod if globals.EnableMtwmStoreWrite { if approveType == partner.AfsApproveTypeRefused { err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromAfsOrder(order), order.VendorStoreID).OrderRefundReject(utils.Str2Int64(order.VendorOrderID), reason) + } else if approveType == partner.AfsApproveTypeRefusedToRefundMoney { + return errors.New("此平台暂时不支持") } else { err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromAfsOrder(order), order.VendorStoreID).OrderRefundAgree(utils.Str2Int64(order.VendorOrderID), reason) } diff --git a/business/partner/purchase/tiktok_store/order_afs.go b/business/partner/purchase/tiktok_store/order_afs.go index 51c2ffcb7..01d97f589 100644 --- a/business/partner/purchase/tiktok_store/order_afs.go +++ b/business/partner/purchase/tiktok_store/order_afs.go @@ -114,8 +114,10 @@ func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *mod if globals.EnableDdStoreWrite { if approveType == partner.AfsApproveTypeRefused { // 拒绝退货 err = getAPI(order.VendorOrgCode, order.JxStoreID, "").AfterSaleOperate(tiktokShop.AfterSaleEmuRefuseOnlyRefundApply, order.AfsOrderID, "拒绝退货", utils.Str2Int64(order.VendorStoreID)) - } else { + } else if approveType == partner.AfsApproveTypeRefund { // 同意 err = getAPI(order.VendorOrgCode, order.JxStoreID, "").AfterSaleOperate(tiktokShop.AfterSaleEmuAgreeOnlyRefundApply, order.AfsOrderID, "同意仅退款", utils.Str2Int64(order.VendorStoreID)) + } else if approveType == partner.AfsApproveTypeRefusedToRefundMoney { // 退货转退款 + err = getAPI(order.VendorOrgCode, order.JxStoreID, "").AfterSaleOperate(tiktokShop.AfterSaleEmuReturnGoodsToRefundApply, order.AfsOrderID, "退货转退款", utils.Str2Int64(order.VendorStoreID)) } } return err diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index 623891586..f2371f4ba 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -225,31 +225,6 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOr if len(childrenSku.SpecPrices) <= 0 { return nil, errors.New("子品商品详情获取失败") } - param := &sku_syncStock_request.SkuSyncStockParam{ - SkuId: childrenSku.SpecPrices[0].SkuId, - ProductId: utils.Str2Int64(v.VendorSkuID), - Incremental: false, - IdempotentId: "", - StockNum: 0, - OutWarehouseId: vendorStoreID, - } - if err := api.UpdateSkuStock(param); err != nil { - failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], fmt.Sprintf("下架商品异常,添加固定库存.%s", utils.Format4Output(param, false)))...) - } else { - failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], fmt.Sprintf("下架商品正常,添加固定库存.%s", utils.Format4Output(param, false)))...) - } - } - } else { // 上架 - for _, v := range storeSkuList { - - // 子品商品id获取skuId - childrenSku, err := api.GetSkuDetail(v.VendorSkuID, "") - if err != nil { - return nil, err - } - if len(childrenSku.SpecPrices) <= 0 { - return nil, errors.New("子品商品详情获取失败") - } param := &sku_syncStock_request.SkuSyncStockParam{ SkuId: childrenSku.SpecPrices[0].SkuId, @@ -260,9 +235,33 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOr OutWarehouseId: vendorStoreID, } if err := api.UpdateSkuStock(param); err != nil { - failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], fmt.Sprintf("上架架商品异常,添加固定库存.%s", utils.Format4Output(param, false)))...) + failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], fmt.Sprintf("下架架商品异常,添加固定库存.%s", utils.Format4Output(param, false)))...) } else { - failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], fmt.Sprintf("上架架商品异常,添加固定库存.%s", utils.Format4Output(param, false)))...) + failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], fmt.Sprintf("下架商品异常,添加固定库存.%s", utils.Format4Output(param, false)))...) + } + } + } else { // 上架 + for _, v := range storeSkuList { + // 子品商品id获取skuId + childrenSku, err := api.GetSkuDetail(v.VendorSkuID, "") + if err != nil { + return nil, err + } + if len(childrenSku.SpecPrices) <= 0 { + return nil, errors.New("子品商品详情获取失败") + } + param := &sku_syncStock_request.SkuSyncStockParam{ + SkuId: childrenSku.SpecPrices[0].SkuId, + ProductId: utils.Str2Int64(v.VendorSkuID), + Incremental: false, + IdempotentId: "", + StockNum: 0, + OutWarehouseId: vendorStoreID, + } + if err := api.UpdateSkuStock(param); err != nil { + failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], fmt.Sprintf("上架商品异常,添加固定库存.%s", utils.Format4Output(param, false)))...) + } else { + failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], fmt.Sprintf("上架商品正常,添加固定库存.%s", utils.Format4Output(param, false)))...) } } } From 30116720107201df99f31d33b04b11e4d64f1f69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 28 Oct 2022 18:47:53 +0800 Subject: [PATCH 3/9] 1 --- controllers/tiktok_order.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/controllers/tiktok_order.go b/controllers/tiktok_order.go index 2a1eecdcb..04bafaf62 100644 --- a/controllers/tiktok_order.go +++ b/controllers/tiktok_order.go @@ -2,7 +2,9 @@ package controllers import ( "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api" + "git.rosy.net.cn/baseapi/utils" "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" @@ -35,6 +37,7 @@ func (t *TiktokController) CallbackTiktokOrderMsg() { return } + globals.SugarLogger.Debugf("========callback===%s", utils.Format4Output(orderStatus, false)) for k, v := range orderStatus { for _, callback := range v { resp2 := tiktok_store.OnOrderMsg(k, callback) From 7e8208d9f12f50a917e03eacaa44773c9dade551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 28 Oct 2022 18:57:22 +0800 Subject: [PATCH 4/9] 1 --- business/partner/purchase/tiktok_store/callback.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/business/partner/purchase/tiktok_store/callback.go b/business/partner/purchase/tiktok_store/callback.go index e6f48308c..f702ef10c 100644 --- a/business/partner/purchase/tiktok_store/callback.go +++ b/business/partner/purchase/tiktok_store/callback.go @@ -2,8 +2,10 @@ package tiktok_store import ( tiktokShop "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api" + "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" ) @@ -11,6 +13,9 @@ import ( func OnOrderMsg(msgId string, msg interface{}) (response *tiktokShop.CallbackResponse) { if CurPurchaseHandler != nil { orderId, _ := api.TiktokStore.GetCallbackOrderId(msgId, msg) + globals.SugarLogger.Debugf("======orderId:%s", orderId) + globals.SugarLogger.Debugf("======msg:%s", utils.Format4Output(msg, false)) + jxutils.CallMsgHandler(func() { response = CurPurchaseHandler.onOrderMsg(msgId, orderId, msg) }, jxutils.ComposeUniversalOrderID(orderId, model.VendorIDDD)) From 5d363f8c0a6caa015bcc2699ae8dbc2dbb2dd793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 28 Oct 2022 19:08:50 +0800 Subject: [PATCH 5/9] 1 --- business/partner/purchase/tiktok_store/financial.go | 1 + business/partner/purchase/tiktok_store/order.go | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/business/partner/purchase/tiktok_store/financial.go b/business/partner/purchase/tiktok_store/financial.go index f6f6e023f..3443aedf9 100644 --- a/business/partner/purchase/tiktok_store/financial.go +++ b/business/partner/purchase/tiktok_store/financial.go @@ -152,6 +152,7 @@ func (p *PurchaseHandler) OrderDetail2Financial(result *order_orderDetail_respon } else { err = nil } + globals.SugarLogger.Debugf("==========3%s", utils.Format4Output(order, false)) // 订单 for _, x := range result.SkuOrderList { diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go index 28e78349b..6c75119cb 100644 --- a/business/partner/purchase/tiktok_store/order.go +++ b/business/partner/purchase/tiktok_store/order.go @@ -283,14 +283,16 @@ func (c *PurchaseHandler) onOrderMsg(msgId, orderId string, msg interface{}) (re // 已经支付的订单,当做新订单创建在平台内部 ----------------- if msgId == tiktokShop.CallbackPayOrderMsgTagId { order, err := c.GetOrder(utils.Int64ToStr(appOrgCode), orderId, "") // 获取平台订单详情,制作本地订单 + globals.SugarLogger.Debugf("==========0%s", utils.Format4Output(order, false)) if err != nil { return tiktokShop.Err2CallbackResponse(err, "") } if err := partner.CurOrderManager.OnOrderNew(order, status); err != nil { return tiktokShop.Err2CallbackResponse(err, "") } - + globals.SugarLogger.Debugf("==========1%s", utils.Format4Output(order, false)) orderMap, err := c.getOrderMap("", orderId, "") + globals.SugarLogger.Debugf("==========2%s", utils.Format4Output(orderMap, false)) utils.CallFuncAsync(func() { switch msgId { case tiktokShop.CallbackPayOrderMsgTagId: From 1e3c65e9f2a10c7ae0a0f0c33bfc4873a77621e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 28 Oct 2022 19:17:08 +0800 Subject: [PATCH 6/9] 1 --- business/partner/purchase/tiktok_store/order.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go index 6c75119cb..73e4d0e1f 100644 --- a/business/partner/purchase/tiktok_store/order.go +++ b/business/partner/purchase/tiktok_store/order.go @@ -275,6 +275,7 @@ func (c *PurchaseHandler) onOrderMsg(msgId, orderId string, msg interface{}) (re // 组装订单状态变化 status, appOrgCode := c.callbackMsg2Status(msgId, orderId, msg) + globals.SugarLogger.Debugf("==========-2%s,%d", utils.Format4Output(status, false), appOrgCode) // 校验重复消息 if partner.CurOrderManager.GetStatusDuplicatedCount(status) > 0 { return tiktokShop.Err2CallbackResponse(nil, "") @@ -282,6 +283,7 @@ func (c *PurchaseHandler) onOrderMsg(msgId, orderId string, msg interface{}) (re // 已经支付的订单,当做新订单创建在平台内部 ----------------- if msgId == tiktokShop.CallbackPayOrderMsgTagId { + globals.SugarLogger.Debugf("==========-1%d,%s", appOrgCode, orderId) order, err := c.GetOrder(utils.Int64ToStr(appOrgCode), orderId, "") // 获取平台订单详情,制作本地订单 globals.SugarLogger.Debugf("==========0%s", utils.Format4Output(order, false)) if err != nil { @@ -357,6 +359,7 @@ func (c *PurchaseHandler) callbackMsg2Status(msgId, orderId string, msg interfac case tiktokShop.CallbackPayOrderMsgTagId: orderMsg := tiktokShop.PayOrderData{} if err := utils.Map2StructByJson(msg, &orderMsg, false); err != nil { + globals.SugarLogger.Debugf("==========-Map2StructByJson:%s", err) return nil, 0 } orderStatus.VendorOrderID = utils.Int64ToStr(orderMsg.PId) From 7c56405f7e30d565f8915118fa740706286bbb93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 28 Oct 2022 19:21:16 +0800 Subject: [PATCH 7/9] 1 --- business/partner/purchase/tiktok_store/order.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go index 73e4d0e1f..e92fe5bef 100644 --- a/business/partner/purchase/tiktok_store/order.go +++ b/business/partner/purchase/tiktok_store/order.go @@ -286,6 +286,7 @@ func (c *PurchaseHandler) onOrderMsg(msgId, orderId string, msg interface{}) (re globals.SugarLogger.Debugf("==========-1%d,%s", appOrgCode, orderId) order, err := c.GetOrder(utils.Int64ToStr(appOrgCode), orderId, "") // 获取平台订单详情,制作本地订单 globals.SugarLogger.Debugf("==========0%s", utils.Format4Output(order, false)) + globals.SugarLogger.Debugf("==========5%s", err) if err != nil { return tiktokShop.Err2CallbackResponse(err, "") } From 853a2712dcc78e5a0435e6bf87faf8d155c770f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 28 Oct 2022 19:30:01 +0800 Subject: [PATCH 8/9] 1 --- business/jxstore/cms/sync2.go | 1 - business/jxstore/cms/sync_store_sku.go | 1 - business/partner/purchase/tiktok_store/financial.go | 1 - business/partner/purchase/tiktok_store/order.go | 8 -------- business/partner/purchase/tiktok_store/store.go | 3 +-- .../partner/purchase/tiktok_store/store_sku2_utils.go | 2 -- 6 files changed, 1 insertion(+), 15 deletions(-) diff --git a/business/jxstore/cms/sync2.go b/business/jxstore/cms/sync2.go index cd09cd9ea..2a27c710b 100644 --- a/business/jxstore/cms/sync2.go +++ b/business/jxstore/cms/sync2.go @@ -338,7 +338,6 @@ func OnCreateThing2Tiktok(ctx *jxcontext.Context, db *dao.DaoDB, appOrgCode stri } errList := errlist.New() for _, v := range vendorThingList { - globals.SugarLogger.Debugf("==========本地商品id:[%d],主商品id:[%d],主商品属性:[%s]", v.LocalSkuId, v.MainId, v.SkuAttrId) thingMap := &model.ThingMap{ ThingID: v.LocalSkuId, ThingType: thingType, diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index 6e0ad11b5..60f2cda43 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -616,7 +616,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag } return skuList } - globals.SugarLogger.Debugf("bareSku2Sync==========%s", utils.Format4Output(bareSku2Sync, false)) isContinueWhenError2 := true //如果是银豹平台，则要按照商品skuname维度同步 diff --git a/business/partner/purchase/tiktok_store/financial.go b/business/partner/purchase/tiktok_store/financial.go index 3443aedf9..f6f6e023f 100644 --- a/business/partner/purchase/tiktok_store/financial.go +++ b/business/partner/purchase/tiktok_store/financial.go @@ -152,7 +152,6 @@ func (p *PurchaseHandler) OrderDetail2Financial(result *order_orderDetail_respon } else { err = nil } - globals.SugarLogger.Debugf("==========3%s", utils.Format4Output(order, false)) // 订单 for _, x := range result.SkuOrderList { diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go index e92fe5bef..747388861 100644 --- a/business/partner/purchase/tiktok_store/order.go +++ b/business/partner/purchase/tiktok_store/order.go @@ -275,7 +275,6 @@ func (c *PurchaseHandler) onOrderMsg(msgId, orderId string, msg interface{}) (re // 组装订单状态变化 status, appOrgCode := c.callbackMsg2Status(msgId, orderId, msg) - globals.SugarLogger.Debugf("==========-2%s,%d", utils.Format4Output(status, false), appOrgCode) // 校验重复消息 if partner.CurOrderManager.GetStatusDuplicatedCount(status) > 0 { return tiktokShop.Err2CallbackResponse(nil, "") @@ -283,19 +282,14 @@ func (c *PurchaseHandler) onOrderMsg(msgId, orderId string, msg interface{}) (re // 已经支付的订单,当做新订单创建在平台内部 ----------------- if msgId == tiktokShop.CallbackPayOrderMsgTagId { - globals.SugarLogger.Debugf("==========-1%d,%s", appOrgCode, orderId) order, err := c.GetOrder(utils.Int64ToStr(appOrgCode), orderId, "") // 获取平台订单详情,制作本地订单 - globals.SugarLogger.Debugf("==========0%s", utils.Format4Output(order, false)) - globals.SugarLogger.Debugf("==========5%s", err) if err != nil { return tiktokShop.Err2CallbackResponse(err, "") } if err := partner.CurOrderManager.OnOrderNew(order, status); err != nil { return tiktokShop.Err2CallbackResponse(err, "") } - globals.SugarLogger.Debugf("==========1%s", utils.Format4Output(order, false)) orderMap, err := c.getOrderMap("", orderId, "") - globals.SugarLogger.Debugf("==========2%s", utils.Format4Output(orderMap, false)) utils.CallFuncAsync(func() { switch msgId { case tiktokShop.CallbackPayOrderMsgTagId: @@ -360,7 +354,6 @@ func (c *PurchaseHandler) callbackMsg2Status(msgId, orderId string, msg interfac case tiktokShop.CallbackPayOrderMsgTagId: orderMsg := tiktokShop.PayOrderData{} if err := utils.Map2StructByJson(msg, &orderMsg, false); err != nil { - globals.SugarLogger.Debugf("==========-Map2StructByJson:%s", err) return nil, 0 } orderStatus.VendorOrderID = utils.Int64ToStr(orderMsg.PId) @@ -619,7 +612,6 @@ func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam AddressId: 0, StoreId: utils.Str2Int64(order.VendorStoreID), } - globals.SugarLogger.Debugf("=============%s", utils.Format4Output(param, false)) return getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderDelivering(param) } diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 319289fa9..65a2b7956 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -103,7 +103,6 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri for j := 1; j <= 7; j++ { m[int64(j)] = timeStr } - globals.SugarLogger.Debug("storeDetail.OpenTime1, storeDetail.CloseTime1, storeDetail.OpenTime2, storeDetail.CloseTime2，timeStr===========", storeDetail.OpenTime1, storeDetail.CloseTime1, storeDetail.OpenTime2, storeDetail.CloseTime2, timeStr) } list := shop_batchCreateStore_request.StoreListItem{ RowId: 1, @@ -175,7 +174,7 @@ func CreateOrUpdateAll(vendorOrgCode string, storeID, vendorStoreID int64) error if len(bindWarehouseAndFence) == 0 || utils.IsNil(bindWarehouseAndFence) { //未绑定仓库 if warehouseID, err := CreateWarehouse(vendorOrgCode, utils.Int64ToStr(storeID)); err != nil || warehouseID == 0 || utils.IsNil(warehouseID) { errList.AddErr(fmt.Errorf("门店(%d) 创建仓库失败:%v", storeID, err)) - } else { //绑定 + } else { //绑定 if err = BindStoreWarehouse(vendorOrgCode, utils.Int64ToStr(storeID), vendorStoreID); err != nil { //仓库绑定通过自定义外部ID errList.AddErr(fmt.Errorf("门店(%d) 绑定仓库:%d 失败:%v", storeID, warehouseID, err)) } else { diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index a8afe201a..4de3a10a3 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -206,7 +206,6 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI } storeSku.VendorSkuAttrId = strings.Join(attrId, ",") // 属性id skuID err = dao.CreateThingMap(int64(storeSku.SkuID), utils.Int64ToStr(tiktokResult.ProductId), storeDetail.VendorOrgCode, storeSku.VendorSkuAttrId) - globals.SugarLogger.Debugf("err=============%s", err) } else { storeSku.VendorMainId = localThing[0].VendorThingID storeSku.VendorSkuAttrId = localThing[0].Remark // 属性id skuID @@ -246,7 +245,6 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI param.SpecPrices = GetSpecPrices(param.Specs, vendorStoreID, tiktokResultProductId, storeSku) param.StoreId = utils.Str2Int64(vendorStoreID) - globals.SugarLogger.Debugf("CreateStoreCommodity==========:%s", utils.Format4Output(param, false)) // 抖店创建子商品 tiktokResultChildren, err := api.CreateStoreCommodity(param) if err != nil { From d6cef286c236d5b1c623aac9f6bd99ae712f7f1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 28 Oct 2022 19:30:55 +0800 Subject: [PATCH 9/9] 1 --- business/partner/purchase/doudian/store_test.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/business/partner/purchase/doudian/store_test.go b/business/partner/purchase/doudian/store_test.go index a0ce41b81..a717e0646 100644 --- a/business/partner/purchase/doudian/store_test.go +++ b/business/partner/purchase/doudian/store_test.go @@ -4,7 +4,6 @@ import ( "fmt" shop_batchCreateStore_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_batchCreateStore/request" "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api" - "git.rosy.net.cn/jx-callback/business/partner/purchase/tiktok_store" "testing" ) @@ -114,6 +113,6 @@ func TestCreateFences(t *testing.T) { //t.Fatalf("resp===========:%v", resp) } func TestSplice(t *testing.T) { - resp := tiktok_store.SplicingTimeToDoudian(100, 1100, 1200, 2100) - t.Fatalf("resp===========:%v", resp) + //resp := tiktok_store.SplicingTimeToDoudian(100, 1100, 1200, 2100) + //t.Fatalf("resp===========:%v", resp) }