From da96198616606e79dcceb2eb56162af98092eabc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 4 Mar 2022 16:13:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=89=93=E6=A1=A9=E8=AF=AD?= =?UTF-8?q?=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/scheduler/basesch/basesch.go | 2 -- business/jxcallback/scheduler/basesch/basesch_ext.go | 1 - business/jxcallback/scheduler/defsch/defsch_ext.go | 4 ---- business/partner/delivery/mtps/waybill.go | 9 --------- business/partner/purchase/jx/localjx/order.go | 3 +-- tests/default_test.go | 10 ---------- 6 files changed, 1 insertion(+), 28 deletions(-) diff --git a/business/jxcallback/scheduler/basesch/basesch.go b/business/jxcallback/scheduler/basesch/basesch.go index 912f951b3..a42f68855 100644 --- a/business/jxcallback/scheduler/basesch/basesch.go +++ b/business/jxcallback/scheduler/basesch/basesch.go @@ -177,9 +177,7 @@ func (c *BaseScheduler) CreateWaybill(platformVendorID int, order *model.GoodsOr if model.DeliveryBrandMarkMap[platformVendorID]&storeDetail.BrandIsOpen != 0 && balance >= model.BrandBalanceLimit { if c.IsReallyCallPlatformAPI { // 美团配送订单生成，配送费计算 - globals.SugarLogger.Infof("start create meituan order**************************************************") bill, err = handlerInfo.Handler.CreateWaybill(order, maxDeliveryFee) - globals.SugarLogger.Infof("start create meituan order**************************************************[%d]", bill.DesiredFee) if err != nil { globals.SugarLogger.Infof("CreateWaybill failed orderID:%s vendorID:%d with error:%v", order.VendorOrderID, platformVendorID, err) } else { diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go index 5605c5713..0a9a74f7c 100644 --- a/business/jxcallback/scheduler/basesch/basesch_ext.go +++ b/business/jxcallback/scheduler/basesch/basesch_ext.go @@ -41,7 +41,6 @@ func (c *BaseScheduler) CreateWaybillOnProviders(ctx *jxcontext.Context, order * if handler := partner.GetDeliveryPlatformFromVendorID(storeCourier.VendorID); handler != nil && handler.Use4CreateWaybill { courierVendorID := storeCourier.VendorID // 创建订单 - globals.SugarLogger.Info("美团创建订单(真正创建美团订单开始)***********************") bill, err2 := c.CreateWaybill(courierVendorID, order, maxDeliveryFee) if err = err2; err == nil { globals.SugarLogger.Debugf("CreateWaybillOnProviders orderID:%s userName:%s vendorID:%d bill:%v", order.VendorOrderID, userName, courierVendorID, bill) diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go index 6ea2da786..2262468f1 100644 --- a/business/jxcallback/scheduler/defsch/defsch_ext.go +++ b/business/jxcallback/scheduler/defsch/defsch_ext.go @@ -116,7 +116,6 @@ func (s *DefScheduler) isPossibleSwitch2SelfDelivery(order *model.GoodsOrder) (e // 创建订单 func (s *DefScheduler) CreateWaybillOnProviders4SavedOrder(ctx *jxcontext.Context, savedOrderInfo *WatchOrderInfo, courierVendorIDs, excludeCourierVendorIDs []int, forceCreate bool, maxDeliveryFee int64) (bills []*model.Waybill, err error) { - globals.SugarLogger.Info("美团创建订单(发单)**********************") order := savedOrderInfo.order // 查看订单状态是否处于可配送状态 if !forceCreate { @@ -225,12 +224,9 @@ func (s *DefScheduler) CreateWaybillOnProvidersEx(ctx *jxcontext.Context, vendor order.DeliveryFlag = 0 err = partner.CurOrderManager.UpdateOrderStatusAndDeliveryFlag(order) // 创建订单 - globals.SugarLogger.Info("美团创建订单***********************") if bills, err = s.CreateWaybillOnProviders4SavedOrder(ctx, savedOrderInfo, courierVendorIDs, nil, forceCreate, maxDeliveryFee); err == nil && len(bills) > 0 { partner.CurOrderManager.OnOrderMsg(order, "手动创建运单成功", fmt.Sprintf("%s创建%s平台运单,强发:%t,最高限价:%d", ctx.GetUserName(), model.VendorChineseNames[bills[0].WaybillVendorID], forceCreate, maxDeliveryFee)) } - globals.SugarLogger.Info("美团创建订单成功***********************") - } } else { err = scheduler.ErrCanNotFindOrder diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go index 39717361c..e6059b9c2 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -191,7 +191,6 @@ func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInf // IDeliveryPlatformHandler（美团配送） func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee int64) (bill *model.Waybill, err error) { db := dao.GetDB() - globals.SugarLogger.Info("开始美团订单********************CreateWaybill") // 检查配送平台是否被禁用 vendorOrgCode, err := dao.GetVendorOrgCode(db, model.VendorIDFengNiao, "", model.VendorOrgTypeDelivery) if err != nil { @@ -266,14 +265,7 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee } // 通知美团订单，获取返回订单配送费 - globals.SugarLogger.Info("开始美团订单********************正儿八经的") result, err := api.MtpsAPI.CreateOrderByShop2(billParams) - globals.SugarLogger.Info("输出美团配送费用:=====================111", utils.Float64TwoInt64(result.DeliveryFee)) - globals.SugarLogger.Info("输出美团配送费用:=====================err", err) - globals.SugarLogger.Debugf("输出美团配送费用:=====================111[%d]", utils.Float64TwoInt64(result.DeliveryFee)) - globals.SugarLogger.Debugf("输出美团配送费用:=====================err[%s]", err) - globals.SugarLogger.Debug("输出美团配送费用:=====================err[%s]", err) - globals.SugarLogger.Debug("输出美团配送费用:=====================err[%s]", utils.Float64TwoInt64(result.DeliveryFee)) if err != nil { globals.SugarLogger.Debugf("CreateWaybill failed, orderID:%s, billParams:%v, error:%v", order.VendorOrderID, billParams, err) return nil, err @@ -287,7 +279,6 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee WaybillVendorID: model.VendorIDMTPS, DesiredFee: utils.Float64TwoInt64(result.DeliveryFee), } - globals.SugarLogger.Info("输出美团配送费用:=====================222", bill.DesiredFee) // 当前运单总费大于配送阈值15，日志打印提示 delivery.OnWaybillCreated(bill) diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index 797d3a00d..4b4c79480 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -945,8 +945,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64 } else { outJxOrder.FreightPrice = 0 } - // 京西测试(=================todo=============================) - outJxOrder.FreightPrice = 0 + //表示此订单为物料配送订单 if jxOrder.OrderType != model.OrderTypeNormal { // if fromStoreID != 0 { diff --git a/tests/default_test.go b/tests/default_test.go index 16f61bbc0..217f28498 100644 --- a/tests/default_test.go +++ b/tests/default_test.go @@ -10,7 +10,6 @@ import ( beego "github.com/astaxie/beego/server/web" //. "github.com/smartystreets/goconvey/convey" - "git.rosy.net.cn/jx-callback/globals" ) func init() { @@ -38,12 +37,3 @@ func TestGet(t *testing.T) { // }) //}) } - -func TestPrintDebug(t *testing.T) { - globals.SugarLogger.Info("输出美团配送费用:=====================111", 11111) - globals.SugarLogger.Info("输出美团配送费用:=====================err", 2222) - globals.SugarLogger.Debugf("输出美团配送费用:=====================111[%d]", 33333) - globals.SugarLogger.Debugf("输出美团配送费用:=====================err[%s]", 444444) - globals.SugarLogger.Debug("输出美团配送费用:=====================err[%s]", 555555) - globals.SugarLogger.Debug("输出美团配送费用:=====================err[%s]", 66666) -}