1

business/partner/delivery/rider.go

@@ -2,6 +2,7 @@ package delivery
 
 import (
 	"git.rosy.net.cn/baseapi/platformapi/mtpsapi"
+	"git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
@@ -77,19 +78,26 @@ func GetOrderRiderInfoToPlatform(orderId string) {
 		switch riderInfo.LogisticsStatus {
 		case 20: //配送中
 			riderInfo.LogisticsStatus = 20
-			//riderInfo.LogisticsContext = `正在配送中`
+			riderInfo.OpCode = tiktok_api.TiktokLogisticsORDERRECEIVED
 		case 110: // 完成
 			riderInfo.LogisticsStatus = 40
-			//riderInfo.LogisticsContext = `配送完成`
+			riderInfo.OpCode = tiktok_api.TiktokLogisticsDELIVERED
 		case 105: // 完成
 			riderInfo.LogisticsStatus = 40
-			//riderInfo.LogisticsContext = `被取消`
+			riderInfo.OpCode = tiktok_api.TiktokLogisticsDELIVERED
 		case 115: // 取消
 			riderInfo.LogisticsStatus = 100
-			//riderInfo.LogisticsContext = `被取消`
+			riderInfo.OpCode = tiktok_api.TiktokLogisticsCANCELDELIVERY
+		case 15: // 到店
+			riderInfo.LogisticsStatus = 15
+			riderInfo.OpCode = tiktok_api.TiktokLogisticsRIDERARRIVED
+		case 22, 0: // 异常配送
+			riderInfo.LogisticsStatus = 22
+			riderInfo.OpCode = tiktok_api.TiktokLogisticsINDDELIVERYEXCEPTION
 		default:
 			continue
 		}
+
 		if riderInfo.Longitude == "" {
 			riderInfo.Longitude = utils.Float64ToStr(utils.Int2Float64(v.ConsigneeLng) / 1000000)
 		}
@@ -107,7 +115,6 @@ func GetOrderRiderInfoToPlatform(orderId string) {
 			}
 		case model.VendorIDELM: // 饿了么
 		case model.VendorIDEBAI: // 饿百发单
-
 		case model.VendorIDJD: // 京东发单
 		case model.VendorIDGD: // 美团发单
 		case model.VendorIDYB: // 银豹发单
@@ -116,12 +123,13 @@ func GetOrderRiderInfoToPlatform(orderId string) {
 		case model.VendorIDDD: // 抖店小时达
 			globals.SugarLogger.Debugf("riderInfo Order========:%s", utils.Format4Output(riderInfo, false))
 			// 抖店由于发配送时运单id已经固定了,我们系统在重新发货,或者运单号发生改变时去推送信息时.抖店只识别第一个运单号所以在这儿修改成发单时的第一个运单号!
-			wayBillList, err := dao.GetWaybills(dao.GetDB(), riderInfo.OrderId)
+			//wayBillList, err := dao.GetWaybills(dao.GetDB(), riderInfo.OrderId)
-			if err != nil || len(wayBillList) == 0 {
+			//if err != nil || len(wayBillList) == 0 {
-				globals.SugarLogger.Errorf("Get WayBill List err := %s", err)
+			//	globals.SugarLogger.Errorf("Get WayBill List err := %s", err)
-				continue
+			//	continue
-			}
+			//}
-			riderInfo.ThirdCarrierOrderId = wayBillList[0].VendorWaybillID
+			//riderInfo.ThirdCarrierOrderId = wayBillList[0].VendorWaybillID
+			riderInfo.ThirdCarrierOrderId = riderInfo.OrderId
 			paramsMap := utils.Struct2Map(riderInfo, "", true)
 			if handler := partner.GetPurchaseOrderHandlerFromVendorID(v.VendorID); handler != nil {
 				if err := handler.GetOrderRider(v.VendorOrgCode, v.VendorStoreID, paramsMap); err != nil {

business/partner/purchase/tiktok_store/order.go

@@ -577,7 +577,8 @@ func (c *PurchaseHandler) CanSwitch2SelfDeliver(order *model.GoodsOrder) (isCan
 
 // Swtich2SelfDeliver 抖音转自送的时候就是通知抖音发货了
 func (c *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error) {
-	return getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderDelivering(&order_logisticsAdd_request.OrderLogisticsAddParam{
+	api := getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "")
+	err = api.OrderDelivering(&order_logisticsAdd_request.OrderLogisticsAddParam{
 		OrderId:          order.VendorOrderID,
 		Company:          "",
 		CompanyCode:      "chengdouruoxi",
@@ -588,6 +589,16 @@ func (c *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName s
 		AddressId:        0,
 		StoreId:          utils.Str2Int64(order.VendorStoreID),
 	})
+	if err != nil {
+		return err
+	}
+	// 呼叫骑手
+	err = c.GetOrderRider(order.VendorOrgCode, order.VendorStoreID, map[string]interface{}{
+		"third_carrier_order_id": order.VendorOrderID,
+		"opcode":                 tiktokShop.TiktokLogisticsStatusCALLRIDER,
+		"logistics_context":      "商家呼叫骑手",
+	})
+	return err
 }
 
 // Swtich2SelfDelivered 暂无自送完成
@@ -613,7 +624,11 @@ func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam
 		AddressId:        0,
 		StoreId:          utils.Str2Int64(order.VendorStoreID),
 	}
-	return getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderDelivering(param)
+	err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderDelivering(param)
+	if err != nil {
+		return err
+	}
+	return err
 }
 
 // SelfDeliverDelivered 自配搜完成(暂无)