From ce24432eb7fcdf3c12c7f62c7f263f9693f8bb5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 16 Oct 2023 15:36:24 +0800 Subject: [PATCH 01/32] 1 --- business/jxcallback/scheduler/defsch/defsch_afs.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxcallback/scheduler/defsch/defsch_afs.go b/business/jxcallback/scheduler/defsch/defsch_afs.go index 4a7e855b3..b1ac9bf6b 100644 --- a/business/jxcallback/scheduler/defsch/defsch_afs.go +++ b/business/jxcallback/scheduler/defsch/defsch_afs.go @@ -48,7 +48,7 @@ func (s *DefScheduler) OnAfsOrderNew(order *model.AfsOrder, isPending bool) (err // 京西云打印机打印数据-如果门店使用京西打印机才使用如下代码块 store, err := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode) - if err == nil && store.PrinterVendorID == model.VendorIDJxprint { + if err == nil && store.PrinterVendorID == model.VendorIDJxprint && store.IsPrintCancelOrder == model.YES { if handler := partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID); handler != nil { orderObj, err2 := handler.GetOrder(order.VendorOrgCode, order.VendorOrderID, "") if err2 != nil { From 62a6a667c16ce23307d936d59f87fd466e05a001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 17 Oct 2023 09:32:47 +0800 Subject: [PATCH 02/32] 1 --- business/jxcallback/scheduler/defsch/defsch.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 2358c0f24..97816e76b 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -390,7 +390,7 @@ func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder, isPending bool, isAut if order.Flag&model.OrderFlagMaskFake == 0 { utils.CallFuncAsync(func() { // order = setFakeActualPayPrice(order) - netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder, nil) + //netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder, nil) //目前暂且认为AdjustCount > 0 就是调整单 if order.AdjustCount > 0 { weixinmsg.NotifyAdjustOrder(order) From a73afc843c2bae6ab3b86b658f17643e56f86eeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 17 Oct 2023 17:18:07 +0800 Subject: [PATCH 03/32] 1 --- .../jxcallback/scheduler/defsch/defsch.go | 2 +- business/partner/purchase/ebai/waybill.go | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 97816e76b..2358c0f24 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -390,7 +390,7 @@ func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder, isPending bool, isAut if order.Flag&model.OrderFlagMaskFake == 0 { utils.CallFuncAsync(func() { // order = setFakeActualPayPrice(order) - //netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder, nil) + netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder, nil) //目前暂且认为AdjustCount > 0 就是调整单 if order.AdjustCount > 0 { weixinmsg.NotifyAdjustOrder(order) diff --git a/business/partner/purchase/ebai/waybill.go b/business/partner/purchase/ebai/waybill.go index 5b7569e4e..cd8969ada 100644 --- a/business/partner/purchase/ebai/waybill.go +++ b/business/partner/purchase/ebai/waybill.go @@ -5,7 +5,6 @@ import ( "git.rosy.net.cn/baseapi/platformapi/ebaiapi" "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/business/jxcallback/scheduler" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/globals/api" @@ -49,15 +48,15 @@ func (c *PurchaseHandler) onWaybillMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaiap order.CourierMobile = utils.Interface2String(result["phone"]) } - if order.Status == model.WaybillStatusNew { - order2, _ := partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.WaybillVendorID) - if order2 != nil { - if order2.Status == model.OrderStatusWaitAccepted { - order2.Status = model.OrderStatusNew - scheduler.CurrentScheduler.OnOrderNew(order2, false, false) - } - } - } + //if order.Status == model.WaybillStatusNew { + // order2, _ := partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.WaybillVendorID) + // if order2 != nil { + // if order2.Status == model.OrderStatusWaitAccepted { + // order2.Status = model.OrderStatusNew + // scheduler.CurrentScheduler.OnOrderNew(order2, false, false) + // } + // } + //} } else if order.Status == model.WaybillStatusCanceled { utils.AfterFuncWithRecover(timeout4WaybillCancel, func() { if localOrder, err2 := partner.CurOrderManager.LoadOrder(order.VendorOrderID, model.VendorIDEBAI); err2 == nil { From e9bd89065960003bba4ec5b7b5b3919e211f5e37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 17 Oct 2023 17:59:45 +0800 Subject: [PATCH 04/32] 1 --- business/jxstore/cms/system_store_sku.go | 82 ++++++++++++------------ 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/business/jxstore/cms/system_store_sku.go b/business/jxstore/cms/system_store_sku.go index 967969027..bcff10b28 100644 --- a/business/jxstore/cms/system_store_sku.go +++ b/business/jxstore/cms/system_store_sku.go @@ -49,49 +49,49 @@ func CopyOnStoreSkuToOther(ctx *jxcontext.Context, fromVendorStoreId, toStoreId //} case 2: // 同步分类 - //fromCategoryList, _ := fromApi.RetailCatList(utils.Int2Str(fromVendorStoreId)) - // - //for _, v := range fromCategoryList { - // categoryErr := toApi.RetailCatUpdate(toStore.VendorStoreID, v.Name, &mtwmapi.Param4UpdateCat{ - // CategoryCode: v.Code, - // Sequence: v.Sequence, - // }) - // if categoryErr != nil { - // globals.SugarLogger.Debugf("err := RetailCatUpdate : %v", categoryErr) - // } - // if v.Children != nil && len(v.Children) != 0 { - // for _, c := range v.Children { - // if err3 := toApi.RetailCatUpdate(toStore.VendorStoreID, v.Name, &mtwmapi.Param4UpdateCat{ - // CategoryNameOrigin: v.Name, - // //CategoryCodeOrigin: v.Code, - // //CategoryCode: v.Code, - // SecondaryCategoryCode: c.Code, - // SecondaryCategoryName: c.Name, - // Sequence: c.Sequence, - // }); err3 != nil { - // globals.SugarLogger.Debugf("err := RetailCatUpdate Children : %v", err3) - // } - // } - // } - //} + fromCategoryList, _ := fromApi.RetailCatList(utils.Int2Str(fromVendorStoreId)) + + for _, v := range fromCategoryList { + categoryErr := toApi.RetailCatUpdate(toStore.VendorStoreID, v.Name, &mtwmapi.Param4UpdateCat{ + CategoryCode: v.Code, + Sequence: v.Sequence, + }) + if categoryErr != nil { + globals.SugarLogger.Debugf("err := RetailCatUpdate : %v", categoryErr) + } + if v.Children != nil && len(v.Children) != 0 { + for _, c := range v.Children { + if err3 := toApi.RetailCatUpdate(toStore.VendorStoreID, v.Name, &mtwmapi.Param4UpdateCat{ + CategoryNameOrigin: v.Name, + //CategoryCodeOrigin: v.Code, + //CategoryCode: v.Code, + SecondaryCategoryCode: c.Code, + SecondaryCategoryName: c.Name, + Sequence: c.Sequence, + }); err3 != nil { + globals.SugarLogger.Debugf("err := RetailCatUpdate Children : %v", err3) + } + } + } + } case 3: - i := offSet - for { - // 同步商品 - fromFoodList, err1 := fromApi.RetailListAll(utils.Int2Str(fromVendorStoreId), i) - if len(fromFoodList) == 0 || fromFoodList == nil { - return nil, fmt.Errorf("fromFoodList 为空 %s ,i:= %d", utils.Format4Output(err1, false), i) - } - - if err := BatchInitData(ctx, fromFoodList, toApi, toStore.VendorStoreID); err != nil { - globals.SugarLogger.Debugf("BatchInitData : %s", utils.Format4Output(err, false)) - } - if len(fromFoodList) < 100 { - break - } - i++ - } + //i := offSet + //for { + // // 同步商品 + // fromFoodList, err1 := fromApi.RetailListAll(utils.Int2Str(fromVendorStoreId), i) + // if len(fromFoodList) == 0 || fromFoodList == nil { + // return nil, fmt.Errorf("fromFoodList 为空 %s ,i:= %d", utils.Format4Output(err1, false), i) + // } + // + // if err := BatchInitData(ctx, fromFoodList, toApi, toStore.VendorStoreID); err != nil { + // globals.SugarLogger.Debugf("BatchInitData : %s", utils.Format4Output(err, false)) + // } + // if len(fromFoodList) < 100 { + // break + // } + // i++ + //} } return From 3f0d210da5b2f85a637e288934a01e3650d8bf13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 17 Oct 2023 19:12:03 +0800 Subject: [PATCH 05/32] 1 --- business/partner/im/im.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/business/partner/im/im.go b/business/partner/im/im.go index 4ff6ce02a..599766d75 100644 --- a/business/partner/im/im.go +++ b/business/partner/im/im.go @@ -5,6 +5,8 @@ import ( "encoding/json" "errors" "fmt" + "git.rosy.net.cn/baseapi/platformapi/dingdingapi" + "git.rosy.net.cn/jx-callback/business/jxutils/ddmsg" "strings" "time" @@ -175,6 +177,7 @@ func ReadMsgFromVendor(vendorID int, elmAppID string, msg []byte) error { //3 cid推送新消息 if err = PushMsgByCid(vendorStoreID, vendorID, string(msg)); err != nil { errList.AddErr(fmt.Errorf("向商家cid推送新消息错误：%v", err)) + ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "向商家cid推送新消息错误: ", err.Error()) } if errList.GetErrListAsOne() != nil { From 00aef48924f0fd3d90030689ba74791e12851843 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 17 Oct 2023 19:16:30 +0800 Subject: [PATCH 06/32] 1 --- controllers/mtwm_callback.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/controllers/mtwm_callback.go b/controllers/mtwm_callback.go index 9047edbd5..aabaf8b9e 100644 --- a/controllers/mtwm_callback.go +++ b/controllers/mtwm_callback.go @@ -20,7 +20,9 @@ func (c *MtwmController) onCallbackMsg(msgType string) { callbackResponse = mtwmapi.Err2CallbackResponse(nil, "") } } - c.Data["json"] = callbackResponse + c.Data["json"] = mtwmapi.Err2CallbackResponse(nil, "") + + //c.Data["json"] = callbackResponse c.ServeJSON() } From 9a62ed411ef5ed467923bd0b080b37c7b54613db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 18 Oct 2023 09:06:09 +0800 Subject: [PATCH 07/32] 1 --- business/jxstore/cms/system_store_sku.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/business/jxstore/cms/system_store_sku.go b/business/jxstore/cms/system_store_sku.go index bcff10b28..47ff9d753 100644 --- a/business/jxstore/cms/system_store_sku.go +++ b/business/jxstore/cms/system_store_sku.go @@ -49,8 +49,9 @@ func CopyOnStoreSkuToOther(ctx *jxcontext.Context, fromVendorStoreId, toStoreId //} case 2: // 同步分类 - fromCategoryList, _ := fromApi.RetailCatList(utils.Int2Str(fromVendorStoreId)) - + fromCategoryList, err := fromApi.RetailCatList(utils.Int2Str(fromVendorStoreId)) + globals.SugarLogger.Debugf("fromCategoryList ============ %d", len(fromCategoryList)) + globals.SugarLogger.Debugf("err ============ %v", err) for _, v := range fromCategoryList { categoryErr := toApi.RetailCatUpdate(toStore.VendorStoreID, v.Name, &mtwmapi.Param4UpdateCat{ CategoryCode: v.Code, From a8d1a9ad0da35e99f06b2922ba2d02a67362d9be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 18 Oct 2023 09:41:07 +0800 Subject: [PATCH 08/32] 1 --- business/jxstore/cms/system_store_sku.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/business/jxstore/cms/system_store_sku.go b/business/jxstore/cms/system_store_sku.go index 47ff9d753..8ed119a1a 100644 --- a/business/jxstore/cms/system_store_sku.go +++ b/business/jxstore/cms/system_store_sku.go @@ -4,6 +4,7 @@ import ( "encoding/json" "fmt" "git.rosy.net.cn/jx-callback/globals" + beego "github.com/astaxie/beego/server/web" "time" "git.rosy.net.cn/baseapi/platformapi/mtwmapi" @@ -12,7 +13,6 @@ import ( "git.rosy.net.cn/jx-callback/business/jxutils/tasksch" "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" ) // CopyOnStoreSkuToOther 将一个美团门店分类和商品复制到另一个门店 @@ -26,15 +26,18 @@ func CopyOnStoreSkuToOther(ctx *jxcontext.Context, fromVendorStoreId, toStoreId if err != nil { return "", err } - toApi := partner.CurAPIManager.GetAPI(model.VendorIDMTWM, toStore.VendorOrgCode).(*mtwmapi.API) + //firstApi := api.Mtwm2API + toApi := mtwmapi.New(beego.AppConfig.DefaultString("mtwmAppID2", ""), beego.AppConfig.DefaultString("mtwmSecret2", ""), beego.AppConfig.DefaultString("mtwmCallbackURL2", ""), "") toApi.SetToken(toStore.MtwmToken) fromStore, err := dao.GetStoreDetailByVendorStoreID(db, utils.Int2Str(fromVendorStoreId), model.VendorIDMTWM, "") if err != nil { return "", err } - fromApi := partner.CurAPIManager.GetAPI(model.VendorIDMTWM, fromStore.VendorOrgCode).(*mtwmapi.API) + fromApi := mtwmapi.New(beego.AppConfig.DefaultString("mtwmAppID2", ""), beego.AppConfig.DefaultString("mtwmSecret2", ""), beego.AppConfig.DefaultString("mtwmCallbackURL2", ""), "") fromApi.SetToken(fromStore.MtwmToken) + //fromApi := partner.CurAPIManager.GetAPI(model.VendorIDMTWM, fromStore.VendorOrgCode).(*mtwmapi.API) + //fromApi.SetToken(fromStore.MtwmToken) taskName := fmt.Sprintf("将平台门店[%d],分类和商品复制到[%d]", fromVendorStoreId, toStoreId) config := tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(false) From 24223c19dede49926104aa59c03b17fc2a3de79c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 18 Oct 2023 09:46:27 +0800 Subject: [PATCH 09/32] 1 --- business/jxstore/cms/system_store_sku.go | 84 ++++++++++++------------ 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/business/jxstore/cms/system_store_sku.go b/business/jxstore/cms/system_store_sku.go index 8ed119a1a..aee3dfe08 100644 --- a/business/jxstore/cms/system_store_sku.go +++ b/business/jxstore/cms/system_store_sku.go @@ -52,50 +52,50 @@ func CopyOnStoreSkuToOther(ctx *jxcontext.Context, fromVendorStoreId, toStoreId //} case 2: // 同步分类 - fromCategoryList, err := fromApi.RetailCatList(utils.Int2Str(fromVendorStoreId)) - globals.SugarLogger.Debugf("fromCategoryList ============ %d", len(fromCategoryList)) - globals.SugarLogger.Debugf("err ============ %v", err) - for _, v := range fromCategoryList { - categoryErr := toApi.RetailCatUpdate(toStore.VendorStoreID, v.Name, &mtwmapi.Param4UpdateCat{ - CategoryCode: v.Code, - Sequence: v.Sequence, - }) - if categoryErr != nil { - globals.SugarLogger.Debugf("err := RetailCatUpdate : %v", categoryErr) - } - if v.Children != nil && len(v.Children) != 0 { - for _, c := range v.Children { - if err3 := toApi.RetailCatUpdate(toStore.VendorStoreID, v.Name, &mtwmapi.Param4UpdateCat{ - CategoryNameOrigin: v.Name, - //CategoryCodeOrigin: v.Code, - //CategoryCode: v.Code, - SecondaryCategoryCode: c.Code, - SecondaryCategoryName: c.Name, - Sequence: c.Sequence, - }); err3 != nil { - globals.SugarLogger.Debugf("err := RetailCatUpdate Children : %v", err3) - } - } - } - } + //fromCategoryList, err := fromApi.RetailCatList(utils.Int2Str(fromVendorStoreId)) + //globals.SugarLogger.Debugf("fromCategoryList ============ %d", len(fromCategoryList)) + //globals.SugarLogger.Debugf("err ============ %v", err) + //for _, v := range fromCategoryList { + // categoryErr := toApi.RetailCatUpdate(toStore.VendorStoreID, v.Name, &mtwmapi.Param4UpdateCat{ + // CategoryCode: v.Code, + // Sequence: v.Sequence, + // }) + // if categoryErr != nil { + // globals.SugarLogger.Debugf("err := RetailCatUpdate : %v", categoryErr) + // } + // if v.Children != nil && len(v.Children) != 0 { + // for _, c := range v.Children { + // if err3 := toApi.RetailCatUpdate(toStore.VendorStoreID, v.Name, &mtwmapi.Param4UpdateCat{ + // CategoryNameOrigin: v.Name, + // //CategoryCodeOrigin: v.Code, + // //CategoryCode: v.Code, + // SecondaryCategoryCode: c.Code, + // SecondaryCategoryName: c.Name, + // Sequence: c.Sequence, + // }); err3 != nil { + // globals.SugarLogger.Debugf("err := RetailCatUpdate Children : %v", err3) + // } + // } + // } + //} case 3: - //i := offSet - //for { - // // 同步商品 - // fromFoodList, err1 := fromApi.RetailListAll(utils.Int2Str(fromVendorStoreId), i) - // if len(fromFoodList) == 0 || fromFoodList == nil { - // return nil, fmt.Errorf("fromFoodList 为空 %s ,i:= %d", utils.Format4Output(err1, false), i) - // } - // - // if err := BatchInitData(ctx, fromFoodList, toApi, toStore.VendorStoreID); err != nil { - // globals.SugarLogger.Debugf("BatchInitData : %s", utils.Format4Output(err, false)) - // } - // if len(fromFoodList) < 100 { - // break - // } - // i++ - //} + i := offSet + for { + // 同步商品 + fromFoodList, err1 := fromApi.RetailListAll(utils.Int2Str(fromVendorStoreId), i) + if len(fromFoodList) == 0 || fromFoodList == nil { + return nil, fmt.Errorf("fromFoodList 为空 %s ,i:= %d", utils.Format4Output(err1, false), i) + } + + if err := BatchInitData(ctx, fromFoodList, toApi, toStore.VendorStoreID); err != nil { + globals.SugarLogger.Debugf("BatchInitData : %s", utils.Format4Output(err, false)) + } + if len(fromFoodList) < 100 { + break + } + i++ + } } return From f16aa82c14f8d363c3ef37f7b073eada2cf65ea6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 18 Oct 2023 11:31:03 +0800 Subject: [PATCH 10/32] 1 --- business/jxcallback/orderman/waybill.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxcallback/orderman/waybill.go b/business/jxcallback/orderman/waybill.go index 6988ab3aa..1421046ee 100644 --- a/business/jxcallback/orderman/waybill.go +++ b/business/jxcallback/orderman/waybill.go @@ -264,7 +264,7 @@ func ComplaintRider(ctx *jxcontext.Context, vendorOrderID string, waybillVendorI if err == nil && len(wayBillList) > 0 { for _, v := range wayBillList { if utils.Int2Str(v.WaybillVendorID) == waybillVendorID { - err = p.ComplaintRider(wayBillList[0], complaintID, complaintReasonsMap[complaintID]) + err = p.ComplaintRider(v, complaintID, complaintReasonsMap[complaintID]) } } } From 1f085fe74c54b6384aef8e919073a2a2e454b4d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 18 Oct 2023 11:34:22 +0800 Subject: [PATCH 11/32] 1 --- business/jxcallback/orderman/waybill.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxcallback/orderman/waybill.go b/business/jxcallback/orderman/waybill.go index 1421046ee..b1c11f057 100644 --- a/business/jxcallback/orderman/waybill.go +++ b/business/jxcallback/orderman/waybill.go @@ -260,10 +260,10 @@ func ComplaintRider(ctx *jxcontext.Context, vendorOrderID string, waybillVendorI if len(wayBillList) != model.YES { return fmt.Errorf("订单所属运单不存在,或运单为分配骑手,无法投诉") } - p := partner.GetDeliveryPlatformFromVendorID(wayBillList[0].WaybillVendorID).Handler if err == nil && len(wayBillList) > 0 { for _, v := range wayBillList { if utils.Int2Str(v.WaybillVendorID) == waybillVendorID { + p := partner.GetDeliveryPlatformFromVendorID(wayBillList[0].WaybillVendorID).Handler err = p.ComplaintRider(v, complaintID, complaintReasonsMap[complaintID]) } } From 4400cd293a6f5c453c81f84fb08a614d3e9d1ccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 18 Oct 2023 15:24:13 +0800 Subject: [PATCH 12/32] 1 --- business/jxstore/cms/system_store_sku.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/business/jxstore/cms/system_store_sku.go b/business/jxstore/cms/system_store_sku.go index aee3dfe08..674c1af18 100644 --- a/business/jxstore/cms/system_store_sku.go +++ b/business/jxstore/cms/system_store_sku.go @@ -3,6 +3,8 @@ package cms import ( "encoding/json" "fmt" + "git.rosy.net.cn/baseapi/platformapi/dingdingapi" + "git.rosy.net.cn/jx-callback/business/jxutils/ddmsg" "git.rosy.net.cn/jx-callback/globals" beego "github.com/astaxie/beego/server/web" "time" @@ -88,7 +90,7 @@ func CopyOnStoreSkuToOther(ctx *jxcontext.Context, fromVendorStoreId, toStoreId return nil, fmt.Errorf("fromFoodList 为空 %s ,i:= %d", utils.Format4Output(err1, false), i) } - if err := BatchInitData(ctx, fromFoodList, toApi, toStore.VendorStoreID); err != nil { + if err := BatchInitData(ctx, fromFoodList, toApi, toStore.VendorStoreID, i); err != nil { globals.SugarLogger.Debugf("BatchInitData : %s", utils.Format4Output(err, false)) } if len(fromFoodList) < 100 { @@ -162,7 +164,7 @@ type Skus struct { } // BatchInitData 批量创建商品 -func BatchInitData(ctx *jxcontext.Context, fromSku []*mtwmapi.AppFood, toApi *mtwmapi.API, vendorStoreID string) error { +func BatchInitData(ctx *jxcontext.Context, fromSku []*mtwmapi.AppFood, toApi *mtwmapi.API, vendorStoreID string, i int) error { foodDataList := make([]map[string]interface{}, len(fromSku)) for i, storeSku := range fromSku { foodData := make(map[string]interface{}) @@ -242,17 +244,21 @@ func BatchInitData(ctx *jxcontext.Context, fromSku []*mtwmapi.AppFood, toApi *mt if i == count-1 { failedFoodList, err2 := toApi.RetailBatchInitData(ctx.GetTrackInfo(), vendorStoreID, foodDataList[i*10:]) if err2 != nil { - globals.SugarLogger.Debugf("RetailBatchInitData err3 :%s", utils.Format4Output(err2, false)) + ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "6D18CF27A09511ED8127525400E86DC0", "门店商品同步异常", fmt.Sprintf("%d : %v", i, err2)) + globals.SugarLogger.Debugf("RetailBatchInitData err3 :%v", err2) } if len(failedFoodList) != 0 { + ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "6D18CF27A09511ED8127525400E86DC0", "门店商品同步异常", fmt.Sprintf("%d : %s", i, utils.Format4Output(failedFoodList, false))) globals.SugarLogger.Debugf("RetailBatchInitData err4 :%s", utils.Format4Output(failedFoodList, false)) } } else { failedFoodList, err2 := toApi.RetailBatchInitData(ctx.GetTrackInfo(), vendorStoreID, foodDataList[i*10:(i+1)*10]) if err2 != nil { - globals.SugarLogger.Debugf("RetailBatchInitData err3 :%s", utils.Format4Output(err2, false)) + ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "6D18CF27A09511ED8127525400E86DC0", "门店商品同步异常", fmt.Sprintf("%d : %v", i, err2)) + globals.SugarLogger.Debugf("RetailBatchInitData err3 :%v", err2) } if len(failedFoodList) != 0 { + ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "6D18CF27A09511ED8127525400E86DC0", "门店商品同步异常", fmt.Sprintf("%d : %s", i, utils.Format4Output(failedFoodList, false))) globals.SugarLogger.Debugf("RetailBatchInitData err4 :%s", utils.Format4Output(failedFoodList, false)) } } From 69781583b19158900471feafb0ba3a416d12ac4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 18 Oct 2023 15:55:40 +0800 Subject: [PATCH 13/32] 1 --- business/jxutils/enterprise_msg/enterprise_send_msg.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxutils/enterprise_msg/enterprise_send_msg.go b/business/jxutils/enterprise_msg/enterprise_send_msg.go index 9e7da1b83..a72db5006 100644 --- a/business/jxutils/enterprise_msg/enterprise_send_msg.go +++ b/business/jxutils/enterprise_msg/enterprise_send_msg.go @@ -19,12 +19,12 @@ var enterpriseUserIdMap = map[string]string{ "18981810340": "LiuLei", "187447 76542": "WuTingQi", "17358644830": "ShengTianBanZi1376", - "15729837802": "ZhangShuWei", "1": "2f43b42fd833d1e77420a8dae7419000", // 未设置号码 "15928865396": "HeJiaMeng2", "18780171617": "TianQinXin", "17381914617": "TianQinXin2", "15881105234": "WenShiQi", + "17342535201": "XuXiaox", } // SendUserMessage 发送文本卡片 From e0f544edb0679b7bd06285b3558c171be3734181 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 18 Oct 2023 15:58:18 +0800 Subject: [PATCH 14/32] 1 --- business/jxstore/cms/system_store_sku.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/business/jxstore/cms/system_store_sku.go b/business/jxstore/cms/system_store_sku.go index 674c1af18..1317ea297 100644 --- a/business/jxstore/cms/system_store_sku.go +++ b/business/jxstore/cms/system_store_sku.go @@ -244,21 +244,21 @@ func BatchInitData(ctx *jxcontext.Context, fromSku []*mtwmapi.AppFood, toApi *mt if i == count-1 { failedFoodList, err2 := toApi.RetailBatchInitData(ctx.GetTrackInfo(), vendorStoreID, foodDataList[i*10:]) if err2 != nil { - ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "6D18CF27A09511ED8127525400E86DC0", "门店商品同步异常", fmt.Sprintf("%d : %v", i, err2)) + ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "门店商品同步异常", fmt.Sprintf("%d : %v", i, err2)) globals.SugarLogger.Debugf("RetailBatchInitData err3 :%v", err2) } if len(failedFoodList) != 0 { - ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "6D18CF27A09511ED8127525400E86DC0", "门店商品同步异常", fmt.Sprintf("%d : %s", i, utils.Format4Output(failedFoodList, false))) + ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "门店商品同步异常", fmt.Sprintf("%d : %s", i, utils.Format4Output(failedFoodList, false))) globals.SugarLogger.Debugf("RetailBatchInitData err4 :%s", utils.Format4Output(failedFoodList, false)) } } else { failedFoodList, err2 := toApi.RetailBatchInitData(ctx.GetTrackInfo(), vendorStoreID, foodDataList[i*10:(i+1)*10]) if err2 != nil { - ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "6D18CF27A09511ED8127525400E86DC0", "门店商品同步异常", fmt.Sprintf("%d : %v", i, err2)) + ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "门店商品同步异常", fmt.Sprintf("%d : %v", i, err2)) globals.SugarLogger.Debugf("RetailBatchInitData err3 :%v", err2) } if len(failedFoodList) != 0 { - ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "6D18CF27A09511ED8127525400E86DC0", "门店商品同步异常", fmt.Sprintf("%d : %s", i, utils.Format4Output(failedFoodList, false))) + ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "门店商品同步异常", fmt.Sprintf("%d : %s", i, utils.Format4Output(failedFoodList, false))) globals.SugarLogger.Debugf("RetailBatchInitData err4 :%s", utils.Format4Output(failedFoodList, false)) } } From 795e30ed6eba6c1880be37ae3f2ec459990ccbd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 18 Oct 2023 17:30:33 +0800 Subject: [PATCH 15/32] 1 --- business/jxstore/cms/system_store_sku.go | 6 ------ controllers/taobao_vegetable.go | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/business/jxstore/cms/system_store_sku.go b/business/jxstore/cms/system_store_sku.go index 1317ea297..1e5fee079 100644 --- a/business/jxstore/cms/system_store_sku.go +++ b/business/jxstore/cms/system_store_sku.go @@ -3,8 +3,6 @@ package cms import ( "encoding/json" "fmt" - "git.rosy.net.cn/baseapi/platformapi/dingdingapi" - "git.rosy.net.cn/jx-callback/business/jxutils/ddmsg" "git.rosy.net.cn/jx-callback/globals" beego "github.com/astaxie/beego/server/web" "time" @@ -244,21 +242,17 @@ func BatchInitData(ctx *jxcontext.Context, fromSku []*mtwmapi.AppFood, toApi *mt if i == count-1 { failedFoodList, err2 := toApi.RetailBatchInitData(ctx.GetTrackInfo(), vendorStoreID, foodDataList[i*10:]) if err2 != nil { - ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "门店商品同步异常", fmt.Sprintf("%d : %v", i, err2)) globals.SugarLogger.Debugf("RetailBatchInitData err3 :%v", err2) } if len(failedFoodList) != 0 { - ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "门店商品同步异常", fmt.Sprintf("%d : %s", i, utils.Format4Output(failedFoodList, false))) globals.SugarLogger.Debugf("RetailBatchInitData err4 :%s", utils.Format4Output(failedFoodList, false)) } } else { failedFoodList, err2 := toApi.RetailBatchInitData(ctx.GetTrackInfo(), vendorStoreID, foodDataList[i*10:(i+1)*10]) if err2 != nil { - ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "门店商品同步异常", fmt.Sprintf("%d : %v", i, err2)) globals.SugarLogger.Debugf("RetailBatchInitData err3 :%v", err2) } if len(failedFoodList) != 0 { - ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "门店商品同步异常", fmt.Sprintf("%d : %s", i, utils.Format4Output(failedFoodList, false))) globals.SugarLogger.Debugf("RetailBatchInitData err4 :%s", utils.Format4Output(failedFoodList, false)) } } diff --git a/controllers/taobao_vegetable.go b/controllers/taobao_vegetable.go index ac503eacb..809e586c2 100644 --- a/controllers/taobao_vegetable.go +++ b/controllers/taobao_vegetable.go @@ -46,7 +46,7 @@ func (c *TaoBaoVegetableController) GetCode() { // 创建或者更新账号token param := &model.VendorOrgCode{ VendorID: model.VendorIDTaoVegetable, - VendorOrgCode: api.TaoVegetableApi.GetVendorOrgCode(), + VendorOrgCode: tokenInfo.UserId, Comment: tokenInfo.UserNick, VendorType: "platform", IsJxCat: 1, From 8e7786b21e91c0fd9fbd522a25456313cade545b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 18 Oct 2023 18:13:17 +0800 Subject: [PATCH 16/32] 1 --- globals/api/apimanager/apimanager.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/globals/api/apimanager/apimanager.go b/globals/api/apimanager/apimanager.go index 05a247815..e8583dad5 100644 --- a/globals/api/apimanager/apimanager.go +++ b/globals/api/apimanager/apimanager.go @@ -86,8 +86,6 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{}) ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "淘鲜达token过期", ",请重新授权") } } - api.TaoVegetableApi = api2 - pfAPI = api2 case model.VendorIDEBAI: pfAPI = api.EbaiAPI From d598e4919f7684d674944171bac311bc292a85a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 18 Oct 2023 18:24:41 +0800 Subject: [PATCH 17/32] 1' --- business/jxcallback/scheduler/defsch/defsch_ext.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go index c3e7bf2c3..5fadb6fe6 100644 --- a/business/jxcallback/scheduler/defsch/defsch_ext.go +++ b/business/jxcallback/scheduler/defsch/defsch_ext.go @@ -470,14 +470,16 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor if order.DeliveryType == model.OrderDeliveryTypeSelfTake { return nil, fmt.Errorf("订单:%s是自提单", vendorOrderID) } - + globals.SugarLogger.Debugf("==============1") // 获取用户送货地址 storeCourierList, err := dao.GetStoreCourierList(db, []int{jxutils.GetSaleStoreIDFromOrder(order)}, nil, model.StoreStatusAll, model.StoreAuditStatusOnline) + globals.SugarLogger.Debugf("==============2") if err != nil { return nil, err } // 美团配送订单兑现 waybillList, err := partner.CurOrderManager.GetOrderWaybillInfo(ctx, vendorOrderID, vendorID, true, false) + globals.SugarLogger.Debugf("==============3") if err != nil { return nil, err } @@ -492,6 +494,7 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor } store, _ := dao.GetStoreDetail(db, order.JxStoreID, order.VendorID, order.VendorOrgCode) + globals.SugarLogger.Debugf("==============STORE := %s", utils.Format4Output(store, false)) for _, storeCourier := range storeCourierList { var feeInfo *partner.WaybillFeeInfo if waybillMap[storeCourier.VendorID] != nil { @@ -508,6 +511,7 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor if handler := partner.GetDeliveryPlatformFromVendorID(storeCourier.VendorID); handler != nil { if handler.Use4CreateWaybill { // 获取订单配送费用 + globals.SugarLogger.Debugf("==================4 ") if feeInfo, err = handler.Handler.GetWaybillFee(order); err != nil { feeInfo = &partner.WaybillFeeInfo{ ErrCode: partner.WaybillFeeErrCodeCourierOthers, From 75c0404fe8159d0740b503adb9ce7c0ba6125734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 18 Oct 2023 18:35:20 +0800 Subject: [PATCH 18/32] 1 --- business/jxcallback/scheduler/defsch/defsch_ext.go | 5 ++++- controllers/jx_order.go | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go index 5fadb6fe6..5681d06ad 100644 --- a/business/jxcallback/scheduler/defsch/defsch_ext.go +++ b/business/jxcallback/scheduler/defsch/defsch_ext.go @@ -512,7 +512,10 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor if handler.Use4CreateWaybill { // 获取订单配送费用 globals.SugarLogger.Debugf("==================4 ") - if feeInfo, err = handler.Handler.GetWaybillFee(order); err != nil { + feeInfo, err = handler.Handler.GetWaybillFee(order) + globals.SugarLogger.Debugf("=======feeinfo : %s", utils.Format4Output(feeInfo, false)) + globals.SugarLogger.Debugf("=======feeinfo : %v", err) + if err != nil { feeInfo = &partner.WaybillFeeInfo{ ErrCode: partner.WaybillFeeErrCodeCourierOthers, ErrStr: err.Error(), diff --git a/controllers/jx_order.go b/controllers/jx_order.go index fa97393f5..69449906d 100644 --- a/controllers/jx_order.go +++ b/controllers/jx_order.go @@ -6,6 +6,7 @@ import ( "fmt" "git.rosy.net.cn/jx-callback/business/bidding" "git.rosy.net.cn/jx-callback/business/partner/delivery" + "git.rosy.net.cn/jx-callback/globals" "strings" "time" @@ -110,6 +111,8 @@ func (c *OrderController) ConfirmSelfTake() { func (c *OrderController) QueryOrderWaybillFeeInfo() { c.callQueryOrderWaybillFeeInfo(func(params *tOrderQueryOrderWaybillFeeInfoParams) (retVal interface{}, errCode string, err error) { retVal, err = defsch.FixedScheduler.QueryOrderWaybillFeeInfoEx(params.Ctx, params.VendorOrderID, params.VendorID) + globals.SugarLogger.Debugf("=====retVal := %s", utils.Format4Output(retVal, false)) + globals.SugarLogger.Debugf("=====retVal := %v", err) return retVal, "", err }) } From d949fb70ec2675b5f03a39b5b0e3dd3885ca75f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 18 Oct 2023 19:00:31 +0800 Subject: [PATCH 19/32] 1 --- business/jxcallback/scheduler/defsch/defsch_ext.go | 7 ------- business/partner/purchase/tao_vegetable/order.go | 2 ++ controllers/jx_order.go | 3 --- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go index 5681d06ad..4f49188c6 100644 --- a/business/jxcallback/scheduler/defsch/defsch_ext.go +++ b/business/jxcallback/scheduler/defsch/defsch_ext.go @@ -470,16 +470,13 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor if order.DeliveryType == model.OrderDeliveryTypeSelfTake { return nil, fmt.Errorf("订单:%s是自提单", vendorOrderID) } - globals.SugarLogger.Debugf("==============1") // 获取用户送货地址 storeCourierList, err := dao.GetStoreCourierList(db, []int{jxutils.GetSaleStoreIDFromOrder(order)}, nil, model.StoreStatusAll, model.StoreAuditStatusOnline) - globals.SugarLogger.Debugf("==============2") if err != nil { return nil, err } // 美团配送订单兑现 waybillList, err := partner.CurOrderManager.GetOrderWaybillInfo(ctx, vendorOrderID, vendorID, true, false) - globals.SugarLogger.Debugf("==============3") if err != nil { return nil, err } @@ -494,7 +491,6 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor } store, _ := dao.GetStoreDetail(db, order.JxStoreID, order.VendorID, order.VendorOrgCode) - globals.SugarLogger.Debugf("==============STORE := %s", utils.Format4Output(store, false)) for _, storeCourier := range storeCourierList { var feeInfo *partner.WaybillFeeInfo if waybillMap[storeCourier.VendorID] != nil { @@ -511,10 +507,7 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor if handler := partner.GetDeliveryPlatformFromVendorID(storeCourier.VendorID); handler != nil { if handler.Use4CreateWaybill { // 获取订单配送费用 - globals.SugarLogger.Debugf("==================4 ") feeInfo, err = handler.Handler.GetWaybillFee(order) - globals.SugarLogger.Debugf("=======feeinfo : %s", utils.Format4Output(feeInfo, false)) - globals.SugarLogger.Debugf("=======feeinfo : %v", err) if err != nil { feeInfo = &partner.WaybillFeeInfo{ ErrCode: partner.WaybillFeeErrCodeCourierOthers, diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go index bcf555b8a..7a67dde98 100644 --- a/business/partner/purchase/tao_vegetable/order.go +++ b/business/partner/purchase/tao_vegetable/order.go @@ -101,6 +101,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve //var weight int = 0 order.PmSubsidyMoney = *orderDetail.SkuDiscountPlatformFee // 平台承担优惠 // 添加需要赠送的东西(暂时没有赠品套餐直接商品) + globals.SugarLogger.Debugf("======orderDetail := %s", utils.Format4Output(orderDetail, false)) multiSkuMap := make(map[int]int) if len(*orderDetail.SubOrderResponseList) > 0 { for _, extra := range *orderDetail.SubOrderResponseList { @@ -201,6 +202,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve order.OrderSeq = orderSeq + 1 // 包装袋金额 + globals.SugarLogger.Debugf("==============order := %s", utils.Format4Output(order, false)) store, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), order.VendorStoreID, model.VendorIDTaoVegetable, order.VendorOrgCode) if store != nil { order.StoreName = store.Name // 真实门店名称 diff --git a/controllers/jx_order.go b/controllers/jx_order.go index 69449906d..fa97393f5 100644 --- a/controllers/jx_order.go +++ b/controllers/jx_order.go @@ -6,7 +6,6 @@ import ( "fmt" "git.rosy.net.cn/jx-callback/business/bidding" "git.rosy.net.cn/jx-callback/business/partner/delivery" - "git.rosy.net.cn/jx-callback/globals" "strings" "time" @@ -111,8 +110,6 @@ func (c *OrderController) ConfirmSelfTake() { func (c *OrderController) QueryOrderWaybillFeeInfo() { c.callQueryOrderWaybillFeeInfo(func(params *tOrderQueryOrderWaybillFeeInfoParams) (retVal interface{}, errCode string, err error) { retVal, err = defsch.FixedScheduler.QueryOrderWaybillFeeInfoEx(params.Ctx, params.VendorOrderID, params.VendorID) - globals.SugarLogger.Debugf("=====retVal := %s", utils.Format4Output(retVal, false)) - globals.SugarLogger.Debugf("=====retVal := %v", err) return retVal, "", err }) } From f8857357613756abb991db7780e6c7efd51325fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 18 Oct 2023 19:12:45 +0800 Subject: [PATCH 20/32] 1 --- globals/api/apimanager/apimanager.go | 1 + 1 file changed, 1 insertion(+) diff --git a/globals/api/apimanager/apimanager.go b/globals/api/apimanager/apimanager.go index e8583dad5..600db0751 100644 --- a/globals/api/apimanager/apimanager.go +++ b/globals/api/apimanager/apimanager.go @@ -82,6 +82,7 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{}) } if tokenInfo.AccessToken != "" && tokenInfo.ExpireTime > time.Now().UnixNano()/1e6 { api2.SetToken(tokenInfo.AccessToken) + api2.SetVendorOrgCode(code.VendorOrgCode) } else { ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "淘鲜达token过期", ",请重新授权") } From 131c9b5182fc4eebf6f388d854fc458604b23d56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 18 Oct 2023 19:26:34 +0800 Subject: [PATCH 21/32] 1 --- business/jxcallback/orderman/order.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index dba92d985..c838122e1 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -396,6 +396,7 @@ func (c *OrderManager) SaveOrder(order *model.GoodsOrder, isAdjust bool, db *dao } _, _, err = db.Db.ReadOrCreate(originalOrder, "VendorOrderID", "VendorID") if created { + globals.SugarLogger.Debugf("==========================order.sku := %s", utils.Format4Output(order.Skus, false)) if err = dao.CreateMultiEntities(db, order.Skus); err != nil { baseapi.SugarLogger.Warnf("saveOrder orderID:%s, save order_sku failed with error:%v", order.VendorOrderID, err) } From ea41d3815a9633f2d417195e54592156537a51b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 19 Oct 2023 10:45:34 +0800 Subject: [PATCH 22/32] 1 --- business/jxcallback/orderman/order.go | 1 - business/partner/purchase/tao_vegetable/order.go | 12 +++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index c838122e1..dba92d985 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -396,7 +396,6 @@ func (c *OrderManager) SaveOrder(order *model.GoodsOrder, isAdjust bool, db *dao } _, _, err = db.Db.ReadOrCreate(originalOrder, "VendorOrderID", "VendorID") if created { - globals.SugarLogger.Debugf("==========================order.sku := %s", utils.Format4Output(order.Skus, false)) if err = dao.CreateMultiEntities(db, order.Skus); err != nil { baseapi.SugarLogger.Warnf("saveOrder orderID:%s, save order_sku failed with error:%v", order.VendorOrderID, err) } diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go index 7a67dde98..9c5daf53f 100644 --- a/business/partner/purchase/tao_vegetable/order.go +++ b/business/partner/purchase/tao_vegetable/order.go @@ -101,7 +101,6 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve //var weight int = 0 order.PmSubsidyMoney = *orderDetail.SkuDiscountPlatformFee // 平台承担优惠 // 添加需要赠送的东西(暂时没有赠品套餐直接商品) - globals.SugarLogger.Debugf("======orderDetail := %s", utils.Format4Output(orderDetail, false)) multiSkuMap := make(map[int]int) if len(*orderDetail.SubOrderResponseList) > 0 { for _, extra := range *orderDetail.SubOrderResponseList { @@ -113,8 +112,8 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve StoreSubName: "", Count: utils.Float64TwoInt(*extra.BuySaleQuantity), VendorSkuID: *extra.SkuCode, - SkuID: utils.Str2Int(*extra.SkuCode), - JxSkuID: utils.Str2Int(*extra.SkuCode), + SkuID: 0, + JxSkuID: 0, SkuName: *extra.SkuName, ShopPrice: *extra.Price, VendorPrice: *extra.OriginalFee / utils.Float64TwoInt64(*extra.BuySaleQuantity), @@ -127,7 +126,11 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve IsVendorAct: 0, Upc: *extra.Barcode, } - + // extra.SkuCode 为int类型会超出长度,有时商品为平台创建 + if len(*extra.SkuCode) <= 10 { + sku.SkuID = utils.Str2Int(*extra.SkuCode) + sku.JxSkuID = utils.Str2Int(*extra.SkuCode) + } activityId := make([]int64, 0) activityName := make([]string, 0) if extra.Activitys != nil { @@ -202,7 +205,6 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve order.OrderSeq = orderSeq + 1 // 包装袋金额 - globals.SugarLogger.Debugf("==============order := %s", utils.Format4Output(order, false)) store, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), order.VendorStoreID, model.VendorIDTaoVegetable, order.VendorOrgCode) if store != nil { order.StoreName = store.Name // 真实门店名称 From 692b8a2df5e24f6b6094b4649fdb08abd39b4775 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 19 Oct 2023 11:44:18 +0800 Subject: [PATCH 23/32] 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 9d8c09894..6beb0cc26 100644 --- a/business/partner/purchase/tao_vegetable/callback.go +++ b/business/partner/purchase/tao_vegetable/callback.go @@ -13,7 +13,7 @@ import ( // OnCallbackMsg 淘宝回调接口 func OnCallbackMsg(orderStatus, orderId string, msg interface{}) (response *tao_vegetable.CallBackResult) { if CurPurchaseHandler != nil { - jxutils.CallMsgHandler(func() { + jxutils.CallMsgHandlerAsync(func() { response = CurPurchaseHandler.onOrderMsg(orderStatus, orderId, msg) }, jxutils.ComposeUniversalOrderID(orderId, model.VendorIDTaoVegetable)) } From a253b84395ff05872d2e245f1608ea4c41d0f89b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 19 Oct 2023 14:22:10 +0800 Subject: [PATCH 24/32] 1 --- business/partner/purchase/tiktok_store/order.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go index b83d692e8..904bee2c5 100644 --- a/business/partner/purchase/tiktok_store/order.go +++ b/business/partner/purchase/tiktok_store/order.go @@ -581,7 +581,7 @@ func (c *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName s if err2 != nil { return err2 } - if remoteWaybill.ShipmentStatus >= tiktokShop.ShipmentStatusArrived { //骑手取货后不可取消 + if remoteWaybill.ShipmentStatus >= tiktokShop.ShipmentStatusArrived && remoteWaybill.ShipmentStatus != tiktokShop.ShipmentStatusCanceled { //骑手取货后不可取消 return errors.New("抖音配送骑手已取货,不可转门店自配送/三方配送") } if len(remoteWaybill.TrackNo) != 0 { //存在运单 From 2387994fe3bb8d6359bc363c417ff3ce2fecdb9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 19 Oct 2023 15:10:35 +0800 Subject: [PATCH 25/32] 1 --- business/partner/delivery/rider.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 11f9107d3..858ccc485 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -416,6 +416,7 @@ func UpdateFakeWayBillToTiktok() { continue } + globals.SugarLogger.Debugf("===================fakeWayBill := %s", fakeWayBill[i].VendorOrderID) riderInfo := &utils.RiderInfo{ OrderId: fakeWayBill[i].VendorOrderID, ThirdCarrierOrderId: fakeWayBill[i].VendorOrderID, @@ -427,6 +428,7 @@ func UpdateFakeWayBillToTiktok() { // 设置骑手和下一状态时间 makeRiderInfo(fakeWayBill[i], riderInfo) + globals.SugarLogger.Debugf("===================makeRiderInfo := %s", utils.Format4Output(fakeWayBill[i], false)) if riderInfo.CourierName == "" && fakeWayBill[i].CourierName != "" { riderInfo.CourierName = fakeWayBill[i].CourierName riderInfo.CourierPhone = fakeWayBill[i].CourierMobile @@ -444,6 +446,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("===================paramsMap := %s", utils.Format4Output(paramsMap, 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 bcf9ce12257a0373e46c0fea622f8e496576c782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 19 Oct 2023 15:11:05 +0800 Subject: [PATCH 26/32] 1 --- business/partner/delivery/rider.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 858ccc485..eac2e2ef5 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -400,6 +400,7 @@ func UpdateFakeWayBillToTiktok() { //if randTimeSchedule > 500 { // return //} + globals.SugarLogger.Debugf("===================fakeWayBill := %s", "开始") fakeWayBill, err := dao.GetWayBillFakeOrder() if err != nil { From 5a1a58aa734f5f5b12570daf46bd520999f13f32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 19 Oct 2023 15:17:49 +0800 Subject: [PATCH 27/32] 1 --- business/partner/delivery/rider.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index eac2e2ef5..fe72aa7dc 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -106,7 +106,6 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) { if orderId == "" { // 订单id为空是,是定时轮询操作,不做此状态 waybillList, _ := dao.GetWaybills(dao.GetDB(), v.VendorOrderID, nil) if len(waybillList) > 0 && waybillList[0].Status > model.WaybillStatusEndBegin { - globals.SugarLogger.Debug("订单物流状态结束,不在推送订单状态:orderID[%s],wayBillId[%s]", v.VendorOrderID, waybillList[0].VendorWaybillID) continue } } @@ -326,10 +325,13 @@ func makeRiderInfo(fakeWayBill *model.Waybill, riderInfo *utils.RiderInfo) { } storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), storeId, order.VendorID, order.VendorOrgCode) + globals.SugarLogger.Debugf("========storeDetail := %s", utils.Format4Output(storeDetail, false)) waybill2, err := cms.GetSToURidingDistance2(jxutils.IntCoordinate2Standard(storeDetail.Lng), jxutils.IntCoordinate2Standard(storeDetail.Lat), jxutils.IntCoordinate2Standard(order.ConsigneeLng), jxutils.IntCoordinate2Standard(order.ConsigneeLat), fakeWayBill.VendorOrderID) if err != nil { ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "百度地图骑行方案获取错误:", utils.Format4Output(err.Error(), false)) } + globals.SugarLogger.Debugf("========waybill2 := %s", utils.Format4Output(waybill2, false)) + globals.SugarLogger.Debugf("========err := %v", err) courierCoordinate := strings.Split(waybill2.CourierCoordinate, ",") if len(courierCoordinate) < 2 && fakeWayBill.Status < model.WaybillStatusDelivered { courierCoordinate = append(courierCoordinate, utils.Float64ToStr(jxutils.IntCoordinate2Standard(storeDetail.Lng)), utils.Float64ToStr(jxutils.IntCoordinate2Standard(storeDetail.Lat))) From 5970672ee087b96ca955e90e119435e77bd6307f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 19 Oct 2023 15:26:42 +0800 Subject: [PATCH 28/32] 1 --- business/jxstore/cms/cms.go | 7 +++++++ business/partner/delivery/rider.go | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go index 631c3480c..71d4acbc4 100644 --- a/business/jxstore/cms/cms.go +++ b/business/jxstore/cms/cms.go @@ -5,6 +5,7 @@ import ( "fmt" "git.rosy.net.cn/baseapi/platformapi/autonavi" "git.rosy.net.cn/baseapi/platformapi/baidunavi" + "git.rosy.net.cn/jx-callback/globals" "math" "reflect" "regexp" @@ -635,6 +636,10 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way if v.OriginalData == "" { //originalData, distance, durationTime, err := GetCyclingLine(origin, destination) originalData, distance, durationTime, err := GetCyclingLine(sLng, sLat, uLng, uLat) + globals.SugarLogger.Debugf("===========originalData := %s", utils.Format4Output(originalData, false)) + globals.SugarLogger.Debugf("===========originalData := %d", distance) + globals.SugarLogger.Debugf("===========originalData := %d", durationTime) + globals.SugarLogger.Debugf("===========originalData := %v", err) if err == nil { v.OriginalData = strings.Join(originalData, ";") v.Distance = distance @@ -681,6 +686,7 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way } } } + globals.SugarLogger.Debugf("=======================1") // 当这个运单为假物流/门店真实自送/获取运单骑手信息为空的时候使用假的骑手信息 if (v.WaybillVendorID == model.VendorJXFakeWL || v.WaybillVendorID == model.VendorIDUnknown || v.CourierCoordinate == "") && v.OriginalData != "" { @@ -701,6 +707,7 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way v.CourierCoordinate = riderLine[len(riderLine)-1] } } + globals.SugarLogger.Debugf("=======================2") dao.UpdateEntity(db, v, "OriginalData", "CourierCoordinate", "Distance", "DurationTime") if v.CourierName == "" || v.CourierMobile == "" { diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index fe72aa7dc..8ee9ec77d 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -327,11 +327,12 @@ func makeRiderInfo(fakeWayBill *model.Waybill, riderInfo *utils.RiderInfo) { globals.SugarLogger.Debugf("========storeDetail := %s", utils.Format4Output(storeDetail, false)) waybill2, err := cms.GetSToURidingDistance2(jxutils.IntCoordinate2Standard(storeDetail.Lng), jxutils.IntCoordinate2Standard(storeDetail.Lat), jxutils.IntCoordinate2Standard(order.ConsigneeLng), jxutils.IntCoordinate2Standard(order.ConsigneeLat), fakeWayBill.VendorOrderID) + globals.SugarLogger.Debugf("========waybill2 := %s", utils.Format4Output(waybill2, false)) + globals.SugarLogger.Debugf("========err := %v", err) if err != nil { ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "百度地图骑行方案获取错误:", utils.Format4Output(err.Error(), false)) } - globals.SugarLogger.Debugf("========waybill2 := %s", utils.Format4Output(waybill2, false)) - globals.SugarLogger.Debugf("========err := %v", err) + courierCoordinate := strings.Split(waybill2.CourierCoordinate, ",") if len(courierCoordinate) < 2 && fakeWayBill.Status < model.WaybillStatusDelivered { courierCoordinate = append(courierCoordinate, utils.Float64ToStr(jxutils.IntCoordinate2Standard(storeDetail.Lng)), utils.Float64ToStr(jxutils.IntCoordinate2Standard(storeDetail.Lat))) From 6d0626b182f9c13de15126e6a6d6512d229af457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 19 Oct 2023 15:30:11 +0800 Subject: [PATCH 29/32] 1 --- business/jxstore/misc/misc.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 0935c3b33..937c1c586 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -2,7 +2,6 @@ package misc import ( "fmt" - "git.rosy.net.cn/jx-callback/business/jxcallback/auto_delivery" "sync" "time" @@ -217,10 +216,10 @@ func Init() { }, 10*time.Second, 5*time.Minute) // (自动发单拣货,设置骑手) 刷单用 - ScheduleTimerFuncByInterval(func() { - auto_delivery.Init() // 初始化骑手列表 - auto_delivery.AutoSettingFakeDelivery() - }, 10*time.Second, 5*time.Minute) + //ScheduleTimerFuncByInterval(func() { + // auto_delivery.Init() // 初始化骑手列表 + // auto_delivery.AutoSettingFakeDelivery() + //}, 10*time.Second, 5*time.Minute) // 定时任务更新负责人信息 ScheduleTimerFunc("RefreshStoreOperator", func() { From 3a8e29d8bdbb30eeada80f5dfcee8272b004353f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 19 Oct 2023 15:50:52 +0800 Subject: [PATCH 30/32] 1 --- business/jxstore/cms/cms.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go index 71d4acbc4..fcdd234f0 100644 --- a/business/jxstore/cms/cms.go +++ b/business/jxstore/cms/cms.go @@ -628,6 +628,7 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way return nil, err } for _, v := range waybills { + globals.SugarLogger.Debugf("=============GetSToURidingDistance2 := %s", utils.Format4Output(v, false)) if v.Status == model.WaybillStatusCanceled { continue } From 5071f5dcafadd27c8d61a4fc3d466e7aa3b9532c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 19 Oct 2023 16:12:15 +0800 Subject: [PATCH 31/32] 1 --- .../jxcallback/scheduler/basesch/basesch.go | 2 +- business/jxstore/cms/cms.go | 25 +++---------------- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/business/jxcallback/scheduler/basesch/basesch.go b/business/jxcallback/scheduler/basesch/basesch.go index 18e3f02f0..31fb0718e 100644 --- a/business/jxcallback/scheduler/basesch/basesch.go +++ b/business/jxcallback/scheduler/basesch/basesch.go @@ -142,7 +142,7 @@ func (c *BaseScheduler) SelfDeliverDelivering(order *model.GoodsOrder, userName localBill, _ := partner.CurOrderManager.LoadWaybill(order.VendorWaybillID, order.WaybillVendorID) // 获取抖音配送状态 tiktokWayBillStatus, _ := partner.GetPurchasePlatformFromVendorID(order.VendorID).OrderLogisticsStatus(order.VendorOrderID) - if tiktokWayBillStatus != nil && tiktokWayBillStatus.LogisticsStatus >= tiktokShop.ShipmentStatusReceived { + if tiktokWayBillStatus != nil && tiktokWayBillStatus.LogisticsStatus >= tiktokShop.ShipmentStatusReceived && tiktokWayBillStatus.LogisticsStatus != tiktokShop.ShipmentStatusCanceled { //取消抖音配送转自送 err = c.CancelWaybill(localBill, partner.CancelWaybillReasonDYPSCancel, partner.CancelWaybillReasonStrDYPSCancel+"抖音骑手已经接单,无法取消") partner.CurOrderManager.OnOrderMsg(order, "取消抖音配送,转用门店自配送/三方配送", "抖音骑手已经接单,无法取消") diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go index fcdd234f0..bdef2363d 100644 --- a/business/jxstore/cms/cms.go +++ b/business/jxstore/cms/cms.go @@ -734,10 +734,14 @@ func GetCyclingLine(sLng, sLat, uLng, uLat float64) (polyLineList []string, dist }) coords, err = api.BaiDuNaviAPI.BatchCoordinateConvert(coords, baidunavi.CoordSysGCJ02, baidunavi.CoordSysBaiDu) + globals.SugarLogger.Debugf("=========coords := %s", utils.Format4Output(coords, false)) + globals.SugarLogger.Debugf("=========err := %v", err) if err != nil || len(coords) <= model.NO { return nil, 0, 0, err } data, err := api.BaiDuNaviAPI.DirectionLiteRide(coords) + globals.SugarLogger.Debugf("=========data := %s", utils.Format4Output(data, false)) + globals.SugarLogger.Debugf("=========err := %v", err) if err != nil { return nil, 0, 0, err } @@ -758,26 +762,5 @@ func GetCyclingLine(sLng, sLat, uLng, uLat float64) (polyLineList []string, dist polyLineList = append(polyLineList, strings.Split(v.Path, ";")...) } - // 高德()免费次数太少暂时不用 - //for { - // polyLineList, distance, duration, errCode = api.AutonaviAPI.GetCyclingPlan(origin, destination) - // if errCode != nil { - // ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "获取骑行路线:", utils.Format4Output(errCode, false)) - // } - // if errCode != nil && (errCode.Error() == autonavi.DAILYQUERYOVERLIMIT || errCode.Error() == autonavi.USERDAILYQUERYOVERLIMIT) { - // AutonaviKeyIndex += model.YES - // if AutonaviKeyIndex >= len(AutonaviKeyList) { - // AutonaviKeyIndex = model.NO - // } - // api.AutonaviAPI.SetKey(AutonaviKeyList[AutonaviKeyIndex]) - // } else if errCode != nil { - // return nil, 0, 0, errCode - // } - // - // if len(polyLineList) > model.NO { - // return polyLineList, distance, duration, errCode - // } - //} - return } From 1c7ab3021d417d83960954b4e375a67fcf9be1f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 19 Oct 2023 16:54:30 +0800 Subject: [PATCH 32/32] 1 --- business/jxstore/cms/cms.go | 10 ---------- business/partner/delivery/rider.go | 3 --- 2 files changed, 13 deletions(-) diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go index bdef2363d..0b4a7515e 100644 --- a/business/jxstore/cms/cms.go +++ b/business/jxstore/cms/cms.go @@ -628,7 +628,6 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way return nil, err } for _, v := range waybills { - globals.SugarLogger.Debugf("=============GetSToURidingDistance2 := %s", utils.Format4Output(v, false)) if v.Status == model.WaybillStatusCanceled { continue } @@ -637,10 +636,6 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way if v.OriginalData == "" { //originalData, distance, durationTime, err := GetCyclingLine(origin, destination) originalData, distance, durationTime, err := GetCyclingLine(sLng, sLat, uLng, uLat) - globals.SugarLogger.Debugf("===========originalData := %s", utils.Format4Output(originalData, false)) - globals.SugarLogger.Debugf("===========originalData := %d", distance) - globals.SugarLogger.Debugf("===========originalData := %d", durationTime) - globals.SugarLogger.Debugf("===========originalData := %v", err) if err == nil { v.OriginalData = strings.Join(originalData, ";") v.Distance = distance @@ -708,7 +703,6 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way v.CourierCoordinate = riderLine[len(riderLine)-1] } } - globals.SugarLogger.Debugf("=======================2") dao.UpdateEntity(db, v, "OriginalData", "CourierCoordinate", "Distance", "DurationTime") if v.CourierName == "" || v.CourierMobile == "" { @@ -734,14 +728,10 @@ func GetCyclingLine(sLng, sLat, uLng, uLat float64) (polyLineList []string, dist }) coords, err = api.BaiDuNaviAPI.BatchCoordinateConvert(coords, baidunavi.CoordSysGCJ02, baidunavi.CoordSysBaiDu) - globals.SugarLogger.Debugf("=========coords := %s", utils.Format4Output(coords, false)) - globals.SugarLogger.Debugf("=========err := %v", err) if err != nil || len(coords) <= model.NO { return nil, 0, 0, err } data, err := api.BaiDuNaviAPI.DirectionLiteRide(coords) - globals.SugarLogger.Debugf("=========data := %s", utils.Format4Output(data, false)) - globals.SugarLogger.Debugf("=========err := %v", err) if err != nil { return nil, 0, 0, err } diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 8ee9ec77d..126c72d9f 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -325,10 +325,7 @@ func makeRiderInfo(fakeWayBill *model.Waybill, riderInfo *utils.RiderInfo) { } storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), storeId, order.VendorID, order.VendorOrgCode) - globals.SugarLogger.Debugf("========storeDetail := %s", utils.Format4Output(storeDetail, false)) waybill2, err := cms.GetSToURidingDistance2(jxutils.IntCoordinate2Standard(storeDetail.Lng), jxutils.IntCoordinate2Standard(storeDetail.Lat), jxutils.IntCoordinate2Standard(order.ConsigneeLng), jxutils.IntCoordinate2Standard(order.ConsigneeLat), fakeWayBill.VendorOrderID) - globals.SugarLogger.Debugf("========waybill2 := %s", utils.Format4Output(waybill2, false)) - globals.SugarLogger.Debugf("========err := %v", err) if err != nil { ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "百度地图骑行方案获取错误:", utils.Format4Output(err.Error(), false)) }