diff --git a/business/jxcallback/scheduler/basesch/basesch.go b/business/jxcallback/scheduler/basesch/basesch.go index eaf09ffbf..912f951b3 100644 --- a/business/jxcallback/scheduler/basesch/basesch.go +++ b/business/jxcallback/scheduler/basesch/basesch.go @@ -155,7 +155,7 @@ func (c *BaseScheduler) SelfDeliverDelivered(order *model.GoodsOrder, userName s } func (c *BaseScheduler) CreateWaybill(platformVendorID int, order *model.GoodsOrder, maxDeliveryFee int64) (bill *model.Waybill, err error) { - globals.SugarLogger.Infof("CreateWaybill orderID:%s, vendor:%s", order.VendorOrderID, jxutils.GetVendorName(platformVendorID)) + globals.SugarLogger.Infof("CreateWaybill to meituan orderID:%s, vendor:%s", order.VendorOrderID, jxutils.GetVendorName(platformVendorID)) if !model.IsOrderSolid(order) { // 如果订单是不完整的 globals.SugarLogger.Warnf("CreateWaybill orderID:%s, vendorID:%d is not solid!!!", order.VendorOrderID, platformVendorID) return nil, scheduler.ErrOrderIsNotSolid @@ -177,7 +177,9 @@ 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 0a9a74f7c..5605c5713 100644 --- a/business/jxcallback/scheduler/basesch/basesch_ext.go +++ b/business/jxcallback/scheduler/basesch/basesch_ext.go @@ -41,6 +41,7 @@ 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 2262468f1..6ea2da786 100644 --- a/business/jxcallback/scheduler/defsch/defsch_ext.go +++ b/business/jxcallback/scheduler/defsch/defsch_ext.go @@ -116,6 +116,7 @@ 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 { @@ -224,9 +225,12 @@ 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 74acff2dd..39717361c 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -191,7 +191,7 @@ 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,6 +266,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) diff --git a/main.go b/main.go index f70e32783..92347d1ce 100644 --- a/main.go +++ b/main.go @@ -127,11 +127,6 @@ func checkCmdFlags() bool { } func main() { - globals.SugarLogger.Info("liulei***********************") - globals.SugarLogger.Debugw("liulei***********************") - globals.SugarLogger.Debugf("liulei***********************") - globals.SugarLogger.Debugw("liulei***********************") - globals.SugarLogger.Infow("liulei***********************") if !checkCmdFlags() { Init() if err := tasks.RefreshWeixinToken(); err != nil {