From e2f2d522f6757e44cdbec1a6380fff1ba1ae9528 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 27 Dec 2023 15:14:37 +0800 Subject: [PATCH] 1 --- .../jxcallback/scheduler/basesch/basesch.go | 1 - .../scheduler/basesch/basesch_ext.go | 3 -- business/jxstore/misc/misc.go | 4 +-- business/model/dao/dao_order.go | 1 + business/partner/delivery/rider.go | 34 +++++-------------- business/partner/purchase/ebai/order_afs.go | 18 ++++++++++ 6 files changed, 30 insertions(+), 31 deletions(-) diff --git a/business/jxcallback/scheduler/basesch/basesch.go b/business/jxcallback/scheduler/basesch/basesch.go index 0ff86f162..3b905adce 100644 --- a/business/jxcallback/scheduler/basesch/basesch.go +++ b/business/jxcallback/scheduler/basesch/basesch.go @@ -195,7 +195,6 @@ func (c *BaseScheduler) SelfDeliverDelivered(order *model.GoodsOrder, userName s c.CancelWaybill(bill, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive) } } - globals.SugarLogger.Debugf("===err0 := %v", err) return err }, "SelfDeliverDelivered orderID:%s", order.VendorOrderID) } diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go index 962c4846a..3d84b9d82 100644 --- a/business/jxcallback/scheduler/basesch/basesch_ext.go +++ b/business/jxcallback/scheduler/basesch/basesch_ext.go @@ -86,7 +86,6 @@ func (c *BaseScheduler) SelfDeliveredAndUpdateStatus(ctx *jxcontext.Context, ven if err == nil { if model.IsOrderDeliveryByStore(order) { err = c.SelfDeliverDelivered(order, userName) - globals.SugarLogger.Debugf("===err := %v", err) } else if model.IsOrderDeliveryByPlatform(order) { err = c.Swtich2SelfDelivered(order, userName) } @@ -99,11 +98,9 @@ func (c *BaseScheduler) SelfDeliveredAndUpdateStatus(ctx *jxcontext.Context, ven dao.UpdateEntity(dao.GetDB(), order, "Status", "OrderFinishedAt") } } - globals.SugarLogger.Debugf("===err2 := %v", err) return err }() }, jxutils.ComposeUniversalOrderID(vendorOrderID, vendorID)) - globals.SugarLogger.Debugf("===err3 := %v", err) return err } diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 1fe1202cf..c26267dde 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -214,9 +214,9 @@ func Init() { // 每分钟轮询一次,推送骑手信息(假的订单) ScheduleTimerFuncByInterval(func() { delivery.UpdateFakeWayBillToTiktok() - }, 10*time.Second, 1*time.Minute) + }, 10*time.Second, 2*time.Minute) - // 每五分钟轮询一次推送骑手信息坐标给美团/抖音 (真的订单)[抖音建议小于六十秒] + // 每五分钟轮询一次推送骑手信息坐标给美团/抖音 ScheduleTimerFuncByInterval(func() { delivery.GetOrderRiderInfoToPlatform("", 0) }, 10*time.Second, 4*time.Minute) diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go index 9eb486c16..a7aaf1a0e 100644 --- a/business/model/dao/dao_order.go +++ b/business/model/dao/dao_order.go @@ -575,6 +575,7 @@ func GetOrderRefundSkuList(db *DaoDB, vendorOrderIDs []string) (afsSkuList []*mo sql += " AND t2.vendor_order_id IN (" + GenQuestionMarks(len(vendorOrderIDs)) + ")" sqlParams = append(sqlParams, vendorOrderIDs) } + err = GetRows(db, &afsSkuList, sql, sqlParams...) return afsSkuList, err } diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 292757b92..8799a48da 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -97,11 +97,14 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) { //3.当同一个订单已经上传了一次配送信息，如再次同步会更新配送信息，以最新的一次为准。 //4.如订单已完成、已取消等状态发货将失败。 for _, v := range orders { - if orderId == "" { // 订单id为空是,是定时轮询操作,不做此状态 - waybillList, _ := dao.GetWaybills(db, v.VendorOrderID, nil) - if len(waybillList) > 0 && waybillList[0].Status > model.WaybillStatusEndBegin { - continue - } + //if orderId == "" { // 订单id为空是,是定时轮询操作,不做此状态 + // waybillList, _ := dao.GetWaybills(db, v.VendorOrderID, nil) + // if len(waybillList) > 0 && waybillList[0].Status > model.WaybillStatusEndBegin { + // continue + // } + //} + if v.Status >= model.OrderStatusEndBegin { + continue } riderInfo := &utils.RiderInfo{} @@ -146,7 +149,6 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) { } taoDeliveryStatus := "" - //switch riderInfo.LogisticsStatus { switch v.Status { case 5: // 呼叫骑手 riderInfo.LogisticsStatus = 0 @@ -260,28 +262,10 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) { case model.VendorIDWSC: // 微盟微商城 continue case model.VendorIDDD: // 抖店小时达 - //if riderInfo.ThirdCarrierOrderId == "" { - // waybills, _ := dao.GetWaybills(db, v.VendorOrderID, nil) - // if len(waybills) == model.NO { - // store, _ := dao.GetStoreDetail(db, v.StoreID, v.VendorID, v.VendorOrgCode) - // riderInfo.CourierName = "老板" - // riderInfo.CourierPhone = store.Tel1 - // riderInfo.ThirdCarrierOrderId = v.VendorOrderID - // } else { - // for _, waybill := range waybills { - // if waybill.Status >= model.OrderStatusDelivering && waybill.Status <= model.OrderStatusFinished { - // riderInfo.CourierName = waybill.CourierName - // riderInfo.CourierPhone = waybill.CourierMobile - // riderInfo.ThirdCarrierOrderId = waybill.VendorWaybillID - // continue - // } - // } - // } - //} riderInfo.LogisticsProviderCode = tiktok_api.JxVendorId2TiktokCode(v.WaybillVendorID) if handler := partner.GetPurchaseOrderHandlerFromVendorID(v.VendorID); handler != nil { if err := handler.GetOrderRider(v.VendorOrgCode, v.VendorStoreID, utils.Struct2Map(riderInfo, "", true)); err != nil { - globals.SugarLogger.Debugf("Error pushing meituan rider information :%s--%s--%v", v.VendorOrderID, utils.Format4Output(riderInfo, false), err) + globals.SugarLogger.Debugf("Error pushing tiktok rider information :%s--%s--%v", v.VendorOrderID, utils.Format4Output(riderInfo, false), err) } } case model.VendorIDJX: // 京西平台 diff --git a/business/partner/purchase/ebai/order_afs.go b/business/partner/purchase/ebai/order_afs.go index a3a48436c..30124e11a 100644 --- a/business/partner/purchase/ebai/order_afs.go +++ b/business/partner/purchase/ebai/order_afs.go @@ -180,6 +180,24 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaia afs.VendorStatus = orderStatus.VendorStatus afs.Flag = model.YES dao.UpdateEntity(dao.GetDB(), afs, "Status", "VendorStatus", "Flag") + + //skuList, _ := dao.GetSimpleOrderSkus(db, orderStatus.RefVendorOrderID, nil) + //totalSkuCount := 0 + //for _, v := range skuList { + // totalSkuCount += v.Count + //} + // + //financialSku, _ := dao.GetOrderRefundSkuList(db, []string{orderStatus.RefVendorOrderID}) + //refundSkuCount := 0 + //for _, v := range financialSku { + // refundSkuCount += v.Count + //} + //if totalSkuCount == refundSkuCount { + // goodsOrder, _ := partner.CurOrderManager.LoadOrder(orderStatus.RefVendorOrderID, orderStatus.VendorID) + // goodsOrder.Status = model.OrderStatusCanceled + // goodsOrder.VendorStatus = orderStatus.VendorStatus + // dao.UpdateEntity(db, goodsOrder, "Status", "VendorStatus") + //} } retVal = api.EbaiAPI.Err2CallbackResponse(msg.Cmd, err, nil)