From bdb7c58dd517831b72c093cb8670892e3d488db3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 3 Jul 2023 16:31:51 +0800 Subject: [PATCH] 1 --- business/partner/purchase/tao_vegetable/order.go | 5 ++++- .../partner/purchase/tao_vegetable/order_utils.go | 13 +++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go index 590986c66..ce806dfc8 100644 --- a/business/partner/purchase/tao_vegetable/order.go +++ b/business/partner/purchase/tao_vegetable/order.go @@ -548,7 +548,10 @@ func (c *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName // SelfDeliverDelivering 自配送订单配送中 func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) { - param := OrderStatusChangeDelivery(order, tao_vegetable.OrderStatusDelivery) + param, err := orderStatusChangeNotice(order, tao_vegetable.OrderStatusDelivery) + if err != nil { + return err + } return getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").DeliveryFinish(param) } diff --git a/business/partner/purchase/tao_vegetable/order_utils.go b/business/partner/purchase/tao_vegetable/order_utils.go index ff9bdea39..88fd9f5e7 100644 --- a/business/partner/purchase/tao_vegetable/order_utils.go +++ b/business/partner/purchase/tao_vegetable/order_utils.go @@ -56,8 +56,17 @@ func OrderStatusChangeDelivery(order *model.GoodsOrder, orderStatus string) *req Status: utils.String2Pointer(orderStatus), } bill, _ := partner.CurOrderManager.LoadWaybill(order.VendorWaybillID, order.WaybillVendorID) - param.WorkCallbackRequest.DelivererName = utils.String2Pointer(bill.CourierName) - param.WorkCallbackRequest.DelivererPhone = utils.String2Pointer(bill.CourierMobile) + if bill != nil { + if bill.CourierName == "" && bill.CourierMobile == "" { + storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, model.VendorIDTaoVegetable, "") + param.WorkCallbackRequest.DelivererName = utils.String2Pointer("门店老板") + param.WorkCallbackRequest.DelivererPhone = utils.String2Pointer(storeDetail.Tel1) + } else { + param.WorkCallbackRequest.DelivererName = utils.String2Pointer(bill.CourierName) + param.WorkCallbackRequest.DelivererPhone = utils.String2Pointer(bill.CourierMobile) + } + } + if param.WorkCallbackRequest.DelivererName == nil || param.WorkCallbackRequest.DelivererPhone == nil { param.WorkCallbackRequest.DelivererName = utils.String2Pointer("暂无") param.WorkCallbackRequest.DelivererPhone = utils.String2Pointer("暂无")