diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go index e25f3d12e..3b0592e56 100644 --- a/business/jxcallback/scheduler/defsch/defsch_ext.go +++ b/business/jxcallback/scheduler/defsch/defsch_ext.go @@ -46,7 +46,7 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven s.CancelAll3rdWaybills(ctx, vendorOrderID, vendorID, true) // 取消三方平台配送以及调度 } } else { - if order.Status < model.OrderStatusDelivering || (order.VendorID == model.VendorIDDD && order.Status < model.OrderStatusDelivering) { + if order.Status < model.OrderStatusDelivering { err = s.Swtich2SelfDeliver(order, userName) } else if order.VendorID == order.WaybillVendorID { // 状态为配送中,且是购物平台运单,不能转自送了 err = scheduler.ErrOrderStatusIsNotSuitable4CurOperation @@ -59,7 +59,7 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven order.DeliveryFlag |= model.OrderDeliveryFlagMaskScheduleDisabled | model.OrderDeliveryFlagMaskPurcahseDisabled if err = partner.CurOrderManager.UpdateOrderStatusAndDeliveryFlag(order); err == nil { s.stopTimer(savedOrderInfo) - return err + //return err } } } else { @@ -71,7 +71,6 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven } vendorStatus := fmt.Sprintf("%s转商户自送成功", ctx.GetUserName()) remark := "" - globals.SugarLogger.Debugf("==========err1 := %v", err) if err != nil { vendorStatus = fmt.Sprintf("%s转商户自送失败", ctx.GetUserName()) remark = err.Error() @@ -113,9 +112,7 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven VendorOrgCode: order.VendorOrgCode, } err = dao.CreateEntity(dao.GetDB(), bill) - globals.SugarLogger.Debugf("==========err1 := %v", err) } - globals.SugarLogger.Debugf("==========err2 := %v", err) return err }() }, jxutils.ComposeUniversalOrderID(vendorOrderID, vendorID)) diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go index d534fdcac..117c627eb 100644 --- a/business/partner/purchase/tiktok_store/order.go +++ b/business/partner/purchase/tiktok_store/order.go @@ -597,17 +597,17 @@ func (c *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName s } //转门店自送通知抖音发货 - //err = api.OrderDelivering(&order_logisticsAdd_request.OrderLogisticsAddParam{ - // OrderId: order.VendorOrderID, - // Company: "", - // CompanyCode: "chengdouruoxi", - // LogisticsCode: order.VendorOrderID, - // IsRefundReject: false, - // IsRejectRefund: false, - // SerialNumberList: nil, - // AddressId: 0, - // StoreId: utils.Str2Int64(order.VendorStoreID), - //}) + err = api.OrderDelivering(&order_logisticsAdd_request.OrderLogisticsAddParam{ + OrderId: order.VendorOrderID, + Company: "", + CompanyCode: "chengdouruoxi", + LogisticsCode: order.VendorOrderID, + IsRefundReject: false, + IsRejectRefund: false, + SerialNumberList: nil, + AddressId: 0, + StoreId: utils.Str2Int64(order.VendorStoreID), + }) return err }