diff --git a/business/partner/delivery/dada/waybill.go b/business/partner/delivery/dada/waybill.go index 18ea9b550..ff5d6beb3 100644 --- a/business/partner/delivery/dada/waybill.go +++ b/business/partner/delivery/dada/waybill.go @@ -67,13 +67,16 @@ func (c *DeliveryHandler) OnWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dadaap } func (c *DeliveryHandler) onWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dadaapi.CallbackResponse) { + globals.SugarLogger.Debugf("onWaybillMsg=================:%s", utils.Format4Output(msg, false)) order := c.callbackMsg2Waybill(msg) switch msg.OrderStatus { case dadaapi.OrderStatusWaitingForAccept: - if dadaOrder, err := api.DadaAPI.QueryOrderInfo(msg.OrderID); err == nil { + dadaOrder, err := api.DadaAPI.QueryOrderInfo(msg.OrderID) + if err == nil { order.ActualFee = jxutils.StandardPrice2Int(dadaOrder.ActualFee) order.DesiredFee = jxutils.StandardPrice2Int(dadaOrder.DeliveryFee) } + globals.SugarLogger.Debugf("onWaybillMsg====dadaOrder=============:%s", utils.Format4Output(dadaOrder, false)) order.Status = model.WaybillStatusNew case dadaapi.OrderStatusAccepted: order.Status = model.WaybillStatusCourierAssigned @@ -439,6 +442,8 @@ func (c *DeliveryHandler) GetRidderPosition(ctx *jxcontext.Context, vendorOrgCod // 获取骑手信息(订单详情) func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeisongId string) (rider *mtpsapi.RiderInfo, err error) { order, err := api.DadaAPI.QueryOrderInfo(orderId) + globals.SugarLogger.Debugf("order111111111111 := %s", utils.Format4Output(order, false)) + globals.SugarLogger.Debugf("order111111111111 := %s", utils.Format4Output(err, false)) if err != nil { return nil, err } diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 1fb83fefd..0cd64ba43 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -77,7 +77,7 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) { } if riderInfo == nil || (riderInfo.CourierName == "" && v.WaybillVendorID == -1 && v.DeliveryType == "store") { // 真商家自送 riderInfo.OrderId = v.VendorOrderID - riderInfo.LogisticsStatus = v.Status + riderInfo.LogisticsStatus = 5 riderInfo.CourierName = "石锋" riderInfo.CourierPhone = "18048531223" riderInfo.LogisticsProviderCode = "10017" diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go index 0addc913b..4a85c8b6e 100644 --- a/business/partner/purchase/tiktok_store/order.go +++ b/business/partner/purchase/tiktok_store/order.go @@ -186,13 +186,11 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s closeTime = localStore.CloseTime2 } - latestReceiptTime := order.ExpectedDeliveredTime - h, m, _ := latestReceiptTime.Clock() - if latestReceiptTime.Day() == time.Now().Day() && utils.Str2Int16(fmt.Sprintf("%d%d", h, m)) >= openTime && utils.Str2Int16(fmt.Sprintf("%d%d", h, m)) < closeTime && localStore.Status == model.StoreStatusOpened { + h, m, _ := order.ExpectedDeliveredTime.Clock() + if order.ExpectedDeliveredTime.Day() == time.Now().Day() && utils.Str2Int16(fmt.Sprintf("%d%d", h, m)) >= openTime && utils.Str2Int16(fmt.Sprintf("%d%d", h, m)) < closeTime && localStore.Status == model.StoreStatusOpened { order.BusinessType = model.BusinessTypeDingshida } else { order.BusinessType = model.BusinessTypeImmediate - } // 用户保密信息脱敏