diff --git a/business/partner/purchase/tao_vegetable/order_utils.go b/business/partner/purchase/tao_vegetable/order_utils.go index 86ed90286..11b2bf574 100644 --- a/business/partner/purchase/tao_vegetable/order_utils.go +++ b/business/partner/purchase/tao_vegetable/order_utils.go @@ -63,20 +63,37 @@ func OrderStatusChangeDelivery(order *model.GoodsOrder, orderStatus string) *req Status: utils.String2Pointer(orderStatus), } bill, _ := partner.CurOrderManager.LoadWaybill(order.VendorWaybillID, order.WaybillVendorID) + storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, model.VendorIDTaoVegetable, "") 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) + param.WorkCallbackRequest.DelivererCompany = utils.String2Pointer(tao_vegetable.TaoDeliveryTypeSELF) + param.WorkCallbackRequest.LogisticsNo = utils.String2Pointer(bill.VendorWaybillID) } else { param.WorkCallbackRequest.DelivererName = utils.String2Pointer(bill.CourierName) param.WorkCallbackRequest.DelivererPhone = utils.String2Pointer(bill.CourierMobile) + switch bill.WaybillVendorID { + case model.VendorIDDada: + param.WorkCallbackRequest.DelivererCompany = utils.String2Pointer(tao_vegetable.TaoDeliveryTypeDD) + case model.VendorIDFengNiao: + param.WorkCallbackRequest.DelivererCompany = utils.String2Pointer(tao_vegetable.TaoDeliveryTypeFN) + case model.VendorIDMTPS: + param.WorkCallbackRequest.DelivererCompany = utils.String2Pointer(tao_vegetable.TaoDeliveryTypeMT) + case model.VendorIDSFPS: + param.WorkCallbackRequest.DelivererCompany = utils.String2Pointer(tao_vegetable.TaoDeliveryTypeSF) + default: + param.WorkCallbackRequest.DelivererCompany = utils.String2Pointer(tao_vegetable.TaoDeliveryTypeOther) + } + param.WorkCallbackRequest.LogisticsNo = utils.String2Pointer(bill.VendorWaybillID) } } if param.WorkCallbackRequest.DelivererName == nil || param.WorkCallbackRequest.DelivererPhone == nil { - param.WorkCallbackRequest.DelivererName = utils.String2Pointer("暂无") - param.WorkCallbackRequest.DelivererPhone = utils.String2Pointer("暂无") + param.WorkCallbackRequest.DelivererName = utils.String2Pointer(storeDetail.Tel1) + param.WorkCallbackRequest.DelivererPhone = utils.String2Pointer("门店老板") + param.WorkCallbackRequest.DelivererCompany = utils.String2Pointer(tao_vegetable.TaoDeliveryTypeSELF) + param.WorkCallbackRequest.LogisticsNo = utils.String2Pointer(order.VendorOrderID + "_1") } return param