1

business/partner/delivery/rider.go

@@ -3,13 +3,14 @@ package delivery
 import (
 	"crypto/rand"
 	"fmt"
+	"math/big"
+	"time"
+
 	"git.rosy.net.cn/baseapi"
 	"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
 	"git.rosy.net.cn/jx-callback/business/partner/purchase/mtwm"
-	"math/big"
-	"time"
 
 	"git.rosy.net.cn/baseapi/platformapi/mtpsapi"
 	"git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api"
@@ -86,6 +87,9 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
 	//3.当同一个订单已经上传了一次配送信息，如再次同步会更新配送信息，以最新的一次为准。
 	//4.如订单已完成、已取消等状态发货将失败。
 	for _, v := range orders {
+		if v.Status >= model.OrderStatusFinished || v.Status < model.OrderStatusDelivering {
+			continue
+		}
 		if orderId == "" && v.VendorID == model.VendorIDDD { // 抖音门店订单除了三方配送回调时推送,不在主动推送配送消息
 			continue
 		}
@@ -167,7 +171,7 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
 
 		if riderInfo.CourierPhone == "" {
 			storeDetail, err := dao.GetStoreDetail(dao.GetDB(), v.JxStoreID, 0, "")
-			if err != nil {
+			if err == nil {
 				riderInfo.CourierPhone = storeDetail.Tel1
 			}
 			riderInfo.CourierName = "老板"