From eab2c2547a4d66f0238716d7b773a8766447f161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 27 Oct 2023 18:01:01 +0800 Subject: [PATCH 01/15] 1 --- business/jxcallback/auto_delivery/auto_delivery.go | 5 ++++- business/partner/delivery/rider.go | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/business/jxcallback/auto_delivery/auto_delivery.go b/business/jxcallback/auto_delivery/auto_delivery.go index 2798b0c7f..a41cdd877 100644 --- a/business/jxcallback/auto_delivery/auto_delivery.go +++ b/business/jxcallback/auto_delivery/auto_delivery.go @@ -20,6 +20,9 @@ import ( var riderListInfo = make(map[string][]map[string]string, 0) func Init() { + if len(riderListInfo) != 0 { + return + } db := dao.GetDB() // 骑手列表 configRiderList, err := dao.QueryConfigs(db, "riderList", "Sys", "") @@ -78,7 +81,7 @@ func Init() { riderListInfo = list } -// AutoSettingFakeDelivery 抖音自动设置骑手(饿百), 推送假订单 +// AutoSettingFakeDelivery 抖音自动设置骑手, 推送假订单 func AutoSettingFakeDelivery() { db := dao.GetDB() diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index dbf2cd6c7..604f19d9c 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -413,6 +413,7 @@ func UpdateFakeWayBillToTiktok() { if fakeWayBill[i].StatusTime.After(time.Now()) { continue } + globals.SugarLogger.Debugf("=============waybill := %s", utils.Format4Output(i, false)) riderInfo := &utils.RiderInfo{ OrderId: fakeWayBill[i].VendorOrderID, @@ -442,6 +443,7 @@ func UpdateFakeWayBillToTiktok() { handler := partner.GetPurchaseOrderHandlerFromVendorID(fakeWayBill[i].OrderVendorID) if handler != nil { order, _ := partner.CurOrderManager.LoadOrder(fakeWayBill[i].VendorOrderID, fakeWayBill[i].OrderVendorID) + globals.SugarLogger.Debugf("=============order := %s", utils.Format4Output(order, false)) if err := handler.GetOrderRider(fakeWayBill[i].VendorOrgCode, order.VendorStoreID, paramsMap); err != nil { partner.CurOrderManager.OnOrderMsg(order, tao_vegetable.OrderStatusDelivery, fmt.Sprintf("Fake Pull Rider Info Err :%s--%s--%v", riderInfo.OrderId, riderInfo.ThirdCarrierOrderId, err)) } else { From f095bc9b324d543a017aff5e0b1c38ae4da160c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 27 Oct 2023 18:04:52 +0800 Subject: [PATCH 02/15] 1 --- business/jxstore/cms/cms.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go index 0f1e7ec57..6a9b72bc7 100644 --- a/business/jxstore/cms/cms.go +++ b/business/jxstore/cms/cms.go @@ -3,6 +3,7 @@ package cms import ( "encoding/json" "fmt" + "git.rosy.net.cn/jx-callback/globals" "math" "reflect" "regexp" @@ -734,6 +735,7 @@ func GetCyclingLine(sLng, sLat, uLng, uLat float64) (polyLineList []string, dist if err != nil { return nil, 0, 0, err } + globals.SugarLogger.Debugf("==============:data %s", utils.Format4Output(data, false)) if data == "" { return nil, 0, 0, fmt.Errorf("获取骑行规划路线错误") } From 3b97347fe84fc74d5a25e980fd40d26ff63a95de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 27 Oct 2023 18:13:54 +0800 Subject: [PATCH 03/15] 1 --- business/jxstore/cms/cms.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go index 6a9b72bc7..ff688684d 100644 --- a/business/jxstore/cms/cms.go +++ b/business/jxstore/cms/cms.go @@ -1,7 +1,6 @@ package cms import ( - "encoding/json" "fmt" "git.rosy.net.cn/jx-callback/globals" "math" @@ -740,9 +739,13 @@ func GetCyclingLine(sLng, sLat, uLng, uLat float64) (polyLineList []string, dist return nil, 0, 0, fmt.Errorf("获取骑行规划路线错误") } path := &baidunavi.RiderPath{} - if err := json.Unmarshal([]byte(data.(string)), path); err != nil { + if err := utils.Map2StructByJson(data, path, false); err != nil { return nil, 0, 0, err } + globals.SugarLogger.Debugf("==============:path %s", utils.Format4Output(path, false)) + //if err := json.Unmarshal([]byte(data.(map[string]interface{})), path); err != nil { + // return nil, 0, 0, err + //} if path.Status != model.NO { return nil, 0, 0, fmt.Errorf("%d,%s", path.Status, path.Message) } From d53146b64029061055ef32853c5e5a2096a9212c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 27 Oct 2023 18:19:46 +0800 Subject: [PATCH 04/15] 1 --- business/jxstore/cms/cms.go | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go index ff688684d..6b8757728 100644 --- a/business/jxstore/cms/cms.go +++ b/business/jxstore/cms/cms.go @@ -743,16 +743,11 @@ func GetCyclingLine(sLng, sLat, uLng, uLat float64) (polyLineList []string, dist return nil, 0, 0, err } globals.SugarLogger.Debugf("==============:path %s", utils.Format4Output(path, false)) - //if err := json.Unmarshal([]byte(data.(map[string]interface{})), path); err != nil { - // return nil, 0, 0, err - //} - if path.Status != model.NO { - return nil, 0, 0, fmt.Errorf("%d,%s", path.Status, path.Message) - } - distance = int64(path.Result.Routes[0].Distance) // 距离 - duration = int64(path.Result.Routes[0].Duration) // 时间 - for _, v := range path.Result.Routes[0].Steps { + distance = int64(path.Routes[0].Distance) // 距离 + duration = int64(path.Routes[0].Duration) // 时间 + + for _, v := range path.Routes[0].Steps { polyLineList = append(polyLineList, strings.Split(v.Path, ";")...) } From 0480adb3dcfda322cdf1a202848cf1e3971bfd7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 27 Oct 2023 18:28:47 +0800 Subject: [PATCH 05/15] 1 --- business/jxstore/cms/cms.go | 6 ------ business/partner/delivery/rider.go | 2 -- 2 files changed, 8 deletions(-) diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go index 6b8757728..b50931c56 100644 --- a/business/jxstore/cms/cms.go +++ b/business/jxstore/cms/cms.go @@ -2,7 +2,6 @@ package cms import ( "fmt" - "git.rosy.net.cn/jx-callback/globals" "math" "reflect" "regexp" @@ -631,10 +630,8 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way if v.Status == model.WaybillStatusCanceled { continue } - //if v.Status >= model.WaybillStatusAccepted && v.Status <= model.WaybillStatusCanceled { // 获取骑行路线图 if v.OriginalData == "" { - //originalData, distance, durationTime, err := GetCyclingLine(origin, destination) originalData, distance, durationTime, err := GetCyclingLine(sLng, sLat, uLng, uLat) if err == nil { v.OriginalData = strings.Join(originalData, ";") @@ -643,7 +640,6 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way } } - //} if vendorMaps[v.WaybillVendorID] == model.YES { // 如果是三方配送,更新骑手信息 @@ -734,7 +730,6 @@ func GetCyclingLine(sLng, sLat, uLng, uLat float64) (polyLineList []string, dist if err != nil { return nil, 0, 0, err } - globals.SugarLogger.Debugf("==============:data %s", utils.Format4Output(data, false)) if data == "" { return nil, 0, 0, fmt.Errorf("获取骑行规划路线错误") } @@ -742,7 +737,6 @@ func GetCyclingLine(sLng, sLat, uLng, uLat float64) (polyLineList []string, dist if err := utils.Map2StructByJson(data, path, false); err != nil { return nil, 0, 0, err } - globals.SugarLogger.Debugf("==============:path %s", utils.Format4Output(path, false)) distance = int64(path.Routes[0].Distance) // 距离 duration = int64(path.Routes[0].Duration) // 时间 diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 604f19d9c..dbf2cd6c7 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -413,7 +413,6 @@ func UpdateFakeWayBillToTiktok() { if fakeWayBill[i].StatusTime.After(time.Now()) { continue } - globals.SugarLogger.Debugf("=============waybill := %s", utils.Format4Output(i, false)) riderInfo := &utils.RiderInfo{ OrderId: fakeWayBill[i].VendorOrderID, @@ -443,7 +442,6 @@ func UpdateFakeWayBillToTiktok() { handler := partner.GetPurchaseOrderHandlerFromVendorID(fakeWayBill[i].OrderVendorID) if handler != nil { order, _ := partner.CurOrderManager.LoadOrder(fakeWayBill[i].VendorOrderID, fakeWayBill[i].OrderVendorID) - globals.SugarLogger.Debugf("=============order := %s", utils.Format4Output(order, false)) if err := handler.GetOrderRider(fakeWayBill[i].VendorOrgCode, order.VendorStoreID, paramsMap); err != nil { partner.CurOrderManager.OnOrderMsg(order, tao_vegetable.OrderStatusDelivery, fmt.Sprintf("Fake Pull Rider Info Err :%s--%s--%v", riderInfo.OrderId, riderInfo.ThirdCarrierOrderId, err)) } else { From 3c53d5426fda23d4bcf1ff98fee8d8d3ff72657d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 27 Oct 2023 18:32:43 +0800 Subject: [PATCH 06/15] 1 --- business/jxstore/cms/cms.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go index b50931c56..45560ab16 100644 --- a/business/jxstore/cms/cms.go +++ b/business/jxstore/cms/cms.go @@ -738,12 +738,13 @@ func GetCyclingLine(sLng, sLat, uLng, uLat float64) (polyLineList []string, dist return nil, 0, 0, err } - distance = int64(path.Routes[0].Distance) // 距离 - duration = int64(path.Routes[0].Duration) // 时间 + if path != nil && len(path.Routes) != 0 { + distance = int64(path.Routes[0].Distance) // 距离 + duration = int64(path.Routes[0].Duration) // 时间 - for _, v := range path.Routes[0].Steps { - polyLineList = append(polyLineList, strings.Split(v.Path, ";")...) + for _, v := range path.Routes[0].Steps { + polyLineList = append(polyLineList, strings.Split(v.Path, ";")...) + } } - return } From 007b142a344f8f9de65951981a9e7bd32c78faa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 27 Oct 2023 18:33:30 +0800 Subject: [PATCH 07/15] 1 --- business/jxstore/cms/cms.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go index 45560ab16..2bca80637 100644 --- a/business/jxstore/cms/cms.go +++ b/business/jxstore/cms/cms.go @@ -633,7 +633,7 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way // 获取骑行路线图 if v.OriginalData == "" { originalData, distance, durationTime, err := GetCyclingLine(sLng, sLat, uLng, uLat) - if err == nil { + if err == nil && len(originalData) != model.NO { v.OriginalData = strings.Join(originalData, ";") v.Distance = distance v.DurationTime = durationTime From 6e89b22d65655bb7bf382c182488eb2ae0cb877c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 28 Oct 2023 11:29:44 +0800 Subject: [PATCH 08/15] 1 --- controllers/taobao_vegetable.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/controllers/taobao_vegetable.go b/controllers/taobao_vegetable.go index 809e586c2..4483cc91b 100644 --- a/controllers/taobao_vegetable.go +++ b/controllers/taobao_vegetable.go @@ -8,6 +8,7 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxstore/common" "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/business/partner" taoVegetable "git.rosy.net.cn/jx-callback/business/partner/purchase/tao_vegetable" "git.rosy.net.cn/jx-callback/globals/api" "github.com/astaxie/beego/server/web" @@ -225,8 +226,15 @@ func (c *TaoBaoVegetableController) CancelOnSaleRefundOrder() { default: //callbackResponse := taoVegetable.OnCallbackMsg(tao_vegetable.OrderStatusOnSaleCancel, utils.Int64ToStr(afsOrder.PartCancelRequest.BizOrderId), afsOrder) //c.Data["json"] = callbackResponse - c.Data["json"] = tao_vegetable.CallBackResultOnSaleCancel(fmt.Errorf("不支持售中取消")) - c.ServeJSON() + order, err := partner.CurOrderManager.LoadOrder(utils.Int64ToStr(afsOrder.PartCancelRequest.BizOrderId), model.VendorIDTaoVegetable) + if err != nil || order.Status > model.WaybillStatusCourierArrived { + c.Data["json"] = tao_vegetable.CallBackResultOnSaleCancel(fmt.Errorf("不支持售中取消")) + c.ServeJSON() + } else { + c.Data["json"] = tao_vegetable.CallBackResultOnSaleCancel(nil) + c.ServeJSON() + } + return } } From 8c55b8385f5f94b311087237df7a1a5b2fe18cb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 30 Oct 2023 09:09:14 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E8=A2=8B=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/tao_vegetable/order.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go index 1d41291e6..180a37211 100644 --- a/business/partner/purchase/tao_vegetable/order.go +++ b/business/partner/purchase/tao_vegetable/order.go @@ -104,6 +104,10 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve multiSkuMap := make(map[int]int) if len(*orderDetail.SubOrderResponseList) > 0 { for _, extra := range *orderDetail.SubOrderResponseList { + // 这个是包装袋的价格,用户退款是包装袋未推送退款,导致本地订单退款状态无法更新,取消包装袋的记录 + if *extra.SkuCode == "6108080" { + continue + } sku := &model.OrderSku{ VendorOrderID: order.VendorOrderID, VendorSubOrderID: *extra.OutSubOrderId, From d1dc090daabbe2b74fe0db01e3957d1b4fa415e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 30 Oct 2023 09:14:40 +0800 Subject: [PATCH 10/15] 1 --- business/partner/purchase/tao_vegetable/callback.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/purchase/tao_vegetable/callback.go b/business/partner/purchase/tao_vegetable/callback.go index 6beb0cc26..c2b1c5d52 100644 --- a/business/partner/purchase/tao_vegetable/callback.go +++ b/business/partner/purchase/tao_vegetable/callback.go @@ -17,7 +17,7 @@ func OnCallbackMsg(orderStatus, orderId string, msg interface{}) (response *tao_ response = CurPurchaseHandler.onOrderMsg(orderStatus, orderId, msg) }, jxutils.ComposeUniversalOrderID(orderId, model.VendorIDTaoVegetable)) } - return response + return tao_vegetable.CallBackResultInfo(nil) } func forwardOrderToGy(msg *mtwmapi.CallbackMsg, orderStatus string) { From 02ec9de03522f0b7fcc78c37c5f17b0ed3857b42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 30 Oct 2023 10:10:17 +0800 Subject: [PATCH 11/15] 1 --- business/jxcallback/scheduler/defsch/defsch.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 26314dd32..12cd02527 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -991,6 +991,7 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf if vendorID != model.NO { if _, err = s.CreateWaybillOnProviders4SavedOrder(jxcontext.AdminCtx, savedOrderInfo, nil, excludeVendorIDs, false, maxDeliveryFee); err == nil { savedOrderInfo.retryCount++ + partner.CurOrderManager.OnOrderMsg(order, utils.Int2Str(vendorID), fmt.Sprintf("订单自动创建三方运单成功:%s", jxutils.GetVendorName(vendorID))) } else { partner.CurOrderManager.OnOrderMsg(order, utils.Int2Str(vendorID), fmt.Sprintf("发起自动创建三方运单,目标创建运单平台[%s],创建失败:%v", jxutils.GetVendorName(vendorID), err)) } From d468d2a7dc4d959e2094d95924e430b04d5d2902 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 1 Nov 2023 11:11:42 +0800 Subject: [PATCH 12/15] 1 --- business/partner/purchase/ebai/store_sku2.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/business/partner/purchase/ebai/store_sku2.go b/business/partner/purchase/ebai/store_sku2.go index c2fdee9a7..ea6fda8fa 100644 --- a/business/partner/purchase/ebai/store_sku2.go +++ b/business/partner/purchase/ebai/store_sku2.go @@ -401,7 +401,9 @@ func genSkuParamsFromStoreSkuInfo2(storeSku *dao.StoreSkuSyncInfo, isCreate, isE //if storeSku.ImgMix != "" && ((storeSku.BrandID == storeSku.ExBrandID && storeSku.ExBrandID != 0) || storeSku.ExBrandID == 0) { // img = storeSku.ImgMix //} else { + globals.SugarLogger.Debugf("=======================%s", utils.Format4Output(storeSku, false)) img, _ = api.EbaiAPI.PictureUpload(storeSku.Img, imgdata) + globals.SugarLogger.Debugf("=======================%s", utils.Format4Output(img, false)) //} photos := []map[string]interface{}{ map[string]interface{}{ @@ -443,6 +445,7 @@ func genSkuParamsFromStoreSkuInfo2(storeSku *dao.StoreSkuSyncInfo, isCreate, isE "photos": photos, "preparation_time": storeSku.PreparationTime, } + globals.SugarLogger.Debugf("===============params========%s", utils.Format4Output(photos, false)) if !isExd { var categoryID = utils.Str2Int64(storeSku.VendorCatID) if ebaiExSkuCatMap[storeSku.SkuID] != 0 { From db9510dafc8016f676e734ff6ed2cdf8a4d99c3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 1 Nov 2023 11:23:03 +0800 Subject: [PATCH 13/15] 1 --- business/partner/purchase/ebai/store_sku2.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/partner/purchase/ebai/store_sku2.go b/business/partner/purchase/ebai/store_sku2.go index ea6fda8fa..0335bef5d 100644 --- a/business/partner/purchase/ebai/store_sku2.go +++ b/business/partner/purchase/ebai/store_sku2.go @@ -267,6 +267,7 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v isExd = false customSkuID = int64(storeSku.SkuID) } + globals.SugarLogger.Debugf("=====================storesku := %s", utils.Format4Output(storeSku, false)) params := genSkuParamsFromStoreSkuInfo2(storeSku, true, isExd) if globals.EnableEbaiStoreWrite { strStoreID := utils.Int2Str(storeID) From f91de854281e21b052d6c4bd8234ee055ab658fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 1 Nov 2023 11:42:31 +0800 Subject: [PATCH 14/15] 1 --- business/jxstore/cms/sync_store_sku.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index 49d40f60b..0e508c390 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -498,6 +498,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 } From b0c1ff10232470c98a12eb454e5e1a749ea9060e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 1 Nov 2023 14:42:47 +0800 Subject: [PATCH 15/15] 1 --- business/jxstore/cms/sync_store_sku.go | 1 - business/model/dao/dao_order.go | 1 - business/partner/purchase/ebai/store_sku2.go | 4 ---- 3 files changed, 6 deletions(-) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index 0e508c390..49d40f60b 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -498,7 +498,6 @@ 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 } diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go index 26a550ec6..6a0a0743f 100644 --- a/business/model/dao/dao_order.go +++ b/business/model/dao/dao_order.go @@ -1099,7 +1099,6 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat if params["adjustCount"] != nil { sqlWhere += " AND t1.adjust_count >= ?" sqlParams = append(sqlParams, params["adjustCount"]) - //globals.SugarLogger.Debugf("sqlParams params[adjustCount]=========%d", params["adjustCount"]) } if mustInvoice, ok := params["mustInvoice"].(bool); ok && mustInvoice { sqlWhere += " AND t1.invoice_taxer_id <> ''" diff --git a/business/partner/purchase/ebai/store_sku2.go b/business/partner/purchase/ebai/store_sku2.go index 0335bef5d..c2fdee9a7 100644 --- a/business/partner/purchase/ebai/store_sku2.go +++ b/business/partner/purchase/ebai/store_sku2.go @@ -267,7 +267,6 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v isExd = false customSkuID = int64(storeSku.SkuID) } - globals.SugarLogger.Debugf("=====================storesku := %s", utils.Format4Output(storeSku, false)) params := genSkuParamsFromStoreSkuInfo2(storeSku, true, isExd) if globals.EnableEbaiStoreWrite { strStoreID := utils.Int2Str(storeID) @@ -402,9 +401,7 @@ func genSkuParamsFromStoreSkuInfo2(storeSku *dao.StoreSkuSyncInfo, isCreate, isE //if storeSku.ImgMix != "" && ((storeSku.BrandID == storeSku.ExBrandID && storeSku.ExBrandID != 0) || storeSku.ExBrandID == 0) { // img = storeSku.ImgMix //} else { - globals.SugarLogger.Debugf("=======================%s", utils.Format4Output(storeSku, false)) img, _ = api.EbaiAPI.PictureUpload(storeSku.Img, imgdata) - globals.SugarLogger.Debugf("=======================%s", utils.Format4Output(img, false)) //} photos := []map[string]interface{}{ map[string]interface{}{ @@ -446,7 +443,6 @@ func genSkuParamsFromStoreSkuInfo2(storeSku *dao.StoreSkuSyncInfo, isCreate, isE "photos": photos, "preparation_time": storeSku.PreparationTime, } - globals.SugarLogger.Debugf("===============params========%s", utils.Format4Output(photos, false)) if !isExd { var categoryID = utils.Str2Int64(storeSku.VendorCatID) if ebaiExSkuCatMap[storeSku.SkuID] != 0 {