Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

2023-05-29 10:24:47 +08:00
parent d0ff027799 440ab9cdeb
commit 8951b56dc9
14 changed files with 217 additions and 96 deletions
--- a/business/partner/delivery/rider.go
+++ b/business/partner/delivery/rider.go
@@ -543,6 +543,11 @@ func GetVendorRiderInfo(wayBillVendorId, vendorId int, vendorOrderId, vendorWayb
 		}

 	}
+	if riderInfo.CourierName != "" && riderInfo.CourierPhone != "" {
+		riderInfo.LogisticsContext = fmt.Sprintf(riderInfo.LogisticsContext, riderInfo.CourierName, riderInfo.CourierPhone)
+	} else {
+		riderInfo.LogisticsContext = fmt.Sprintf(riderInfo.LogisticsContext, "暂无", "暂无")
+	}

 	return
 }