From 62fe065d03e6818f134672be679bf50f8f0f911c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 2 Feb 2023 15:12:40 +0800 Subject: [PATCH] 1 --- business/jxcallback/scheduler/defsch/defsch_ext.go | 1 - business/partner/delivery/rider.go | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go index 5af24c375..3b0592e56 100644 --- a/business/jxcallback/scheduler/defsch/defsch_ext.go +++ b/business/jxcallback/scheduler/defsch/defsch_ext.go @@ -48,7 +48,6 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven } else { if order.Status < model.OrderStatusDelivering { err = s.Swtich2SelfDeliver(order, userName) - globals.SugarLogger.Debugf("====================err %v", err) } else if order.VendorID == order.WaybillVendorID { // 状态为配送中，且是购物平台运单，不能转自送了 err = scheduler.ErrOrderStatusIsNotSuitable4CurOperation } diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index d4646cd8f..d81b83f92 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -220,7 +220,6 @@ func UpdateFakeWayBillToTiktok() { } fakeWayBill, err := dao.GetWayBillFakeOrder() - //globals.SugarLogger.Debugf("fakeWayBill======= %s", utils.Format4Output(fakeWayBill, false)) if err != nil { globals.SugarLogger.Debugf("Get Fake Order Err : %s", err.Error()) return @@ -306,14 +305,15 @@ func UpdateFakeWayBillToTiktok() { randTime += 60 } fakeWayBill[i].StatusTime = time.Now().Add(time.Duration(randTime) * time.Second).Local() + fakeWayBill[i].WaybillFinishedAt = time.Now() // 更新假运单 - if _, err := dao.UpdateEntity(dao.GetDB(), fakeWayBill[i], "Status", "VendorStatus", "StatusTime"); err != nil { + if _, err := dao.UpdateEntity(dao.GetDB(), fakeWayBill[i], "Status", "VendorStatus", "StatusTime", "WaybillFinishedAt"); err != nil { globals.SugarLogger.Errorf("Update Fake Way Bill Err:%s--%s--%v", riderInfo.OrderId, riderInfo.ThirdCarrierOrderId, err) } // 更新运单为完成状态 if fakeWayBill[i].Status == model.WaybillStatusDelivered { - sql := `UPDATE goods_order g SET g.status = ?,g.vendor_status = ? WHERE g.vendor_order_id = ? ` - _, err := dao.ExecuteSQL(dao.GetDB(), sql, []interface{}{model.OrderStatusFinished, model.OrderStatusFinished, fakeWayBill[i].VendorOrderID}...) + sql := `UPDATE goods_order g SET g.status = ?,g.vendor_status = ?,g.order_finished_at = ? WHERE g.vendor_order_id = ? ` + _, err := dao.ExecuteSQL(dao.GetDB(), sql, []interface{}{model.OrderStatusFinished, model.OrderStatusFinished, time.Now(), fakeWayBill[i].VendorOrderID}...) if err != nil { globals.SugarLogger.Debugf("UPDATA goods_order Err :%s", err.Error()) }