1

business/partner/delivery/rider.go

@@ -77,16 +77,16 @@ func GetOrderRiderInfoToPlatform(orderId string) {
 		switch riderInfo.LogisticsStatus {
 		case 20: //配送中
 			riderInfo.LogisticsStatus = 20
-			riderInfo.LogisticsContext = `正在配送中`
+			//riderInfo.LogisticsContext = `正在配送中`
 		case 110: // 完成
 			riderInfo.LogisticsStatus = 40
-			riderInfo.LogisticsContext = `配送完成`
+			//riderInfo.LogisticsContext = `配送完成`
 		case 105: // 完成
 			riderInfo.LogisticsStatus = 40
-			riderInfo.LogisticsContext = `被取消`
+			//riderInfo.LogisticsContext = `被取消`
 		case 115: // 取消
 			riderInfo.LogisticsStatus = 100
-			riderInfo.LogisticsContext = `被取消`
+			//riderInfo.LogisticsContext = `被取消`
 		default:
 			continue
 		}
@@ -114,6 +114,14 @@ func GetOrderRiderInfoToPlatform(orderId string) {
 		case model.VendorIDJDShop: // 京东商城
 		case model.VendorIDWSC: // 微盟微商城
 		case model.VendorIDDD: // 抖店小时达
+			globals.SugarLogger.Debugf("riderInfo Order========:%s", utils.Format4Output(riderInfo, false))
+			// 抖店由于发配送时运单id已经固定了,我们系统在重新发货,或者运单号发生改变时去推送信息时.抖店只识别第一个运单号所以在这儿修改成发单时的第一个运单号!
+			wayBillList, err := dao.GetWaybills(dao.GetDB(), riderInfo.OrderId)
+			if err != nil || len(wayBillList) == 0 {
+				globals.SugarLogger.Errorf("Get WayBill List err := %s", err)
+				continue
+			}
+			riderInfo.ThirdCarrierOrderId = wayBillList[0].VendorWaybillID
 			paramsMap := utils.Struct2Map(riderInfo, "", true)
 			if handler := partner.GetPurchaseOrderHandlerFromVendorID(v.VendorID); handler != nil {
 				if err := handler.GetOrderRider(v.VendorOrgCode, v.VendorStoreID, paramsMap); err != nil {