1

business/partner/purchase/tiktok_store/order.go

@@ -242,9 +242,10 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
 
 // GetOrderRider 商家自配送同步配送信息
 func (p *PurchaseHandler) GetOrderRider(vendorOrgCode, vendorStoreID string, param map[string]interface{}) (err error) {
-	appKey := `7152420904331429407`                     // 暂时定死
-	appSecret := `cc7ba367-2394-4cbb-81c6-26f0e929d1c6` //暂时定死
-	return tiktokShop.NewExpress(appKey, appSecret, "").OrderStatusAndPsInfoNew(param)
+	//appKey := `7152420904331429407`                     // 暂时定死
+	//appSecret := `cc7ba367-2394-4cbb-81c6-26f0e929d1c6` //暂时定死
+	//return tiktokShop.NewExpress(appKey, appSecret, "").OrderStatusAndPsInfoNew(param)
+	return getAPI(vendorOrgCode, 0, vendorStoreID).OrderStatusAndPsInfoNew(param)
 }
 
 func (p *PurchaseHandler) GetOrder(vendorOrgCode, vendorOrderID, vendorStoreID string) (order *model.GoodsOrder, err error) {
@@ -653,13 +654,21 @@ func (c *PurchaseHandler) SelfDeliverDelivered(order *model.GoodsOrder, userName
 		ThirdCarrierOrderId:   order.VendorOrderID,
 		CourierName:           "",
 		CourierPhone:          "",
-		LogisticsProviderCode: "10002",
+		LogisticsProviderCode: utils.MyselfPsCode,
 		LogisticsStatus:       0,
 		LogisticsContext:      "商家自配送,已送达",
 		Latitude:              "",
 		Longitude:             "",
 		OpCode:                tiktokShop.TiktokLogisticsDELIVERED,
 	}
+	bills, _ := dao.GetWaybills(dao.GetDB(), order.VendorOrderID, nil)
+	for _, v := range bills {
+		if v.Status == model.OrderStatusCanceled {
+			continue
+		}
+		riderInfo.CourierName = v.CourierName
+		riderInfo.CourierPhone = v.CourierMobile
+	}
 	return c.GetOrderRider("", "", utils.Struct2MapByJson(riderInfo))
 }