diff --git a/platformapi/sfps2/callback.go b/platformapi/sfps2/callback.go index 6f00161c..36a780fd 100644 --- a/platformapi/sfps2/callback.go +++ b/platformapi/sfps2/callback.go @@ -64,21 +64,26 @@ type RiderRecall struct { // OrderComplete 订单完成回调 type OrderComplete struct { - OperatorName string `json:"operator_name"` //配送员姓名 - //OperatorPhone string `json:"operator_phone"` //配送员电话 - OrderStatus float64 `json:"order_status"` //17配送员点击完成 - PushTime int `json:"push_time"` //完成时间 - ReceiptType float64 `json:"receipt_type"` //1:正常签收, 2:商家退回签收 - RiderLng string `json:"rider_lng"` //配送员位置经度 - RiderLat string `json:"rider_lat"` //配送员位置纬度 - SFOrderID string `json:"sf_order_id"` //顺丰订单ID - SFUCode string `json:"sf_ucode"` - ShopId float64 `json:"shop_id"` // 店铺ID - ShopOrderID string `json:"shop_order_id"` //商家订单ID - UrlIndex string `json:"url_index"` //回调url前缀 - StatusDesc string `json:"status_desc"` //状态描述 - PickUpPic string `json:"pickup_pic"` //只有在店铺打开妥投照片回调开关且有妥投照片时才有此字段 - + OrderID string `json:"order_id"` + ShopId float64 `json:"shop_id"` // 店铺ID + OutOrderID string `json:"out_order_id"` + OrderStatus float64 `json:"order_status"` //17配送员点击完成 + StatusDesc string `json:"status_desc"` //状态描述 + RiderName string `json:"rider_name"` + RiderPhone string `json:"rider_phone"` + PushTime int `json:"push_time"` //完成时间 + TotalPrice float64 `json:"total_price"` + DeliveryDistanceMeter float64 `json:"delivery_distance_meter"` + WeightGram float64 `json:"weight_gram"` + StartTime int `json:"start_time"` + ExpectTime int `json:"expect_time"` + TotalPayMoney float64 `json:"total_pay_money"` + RealPayMoney float64 `json:"real_pay_money"` + CouponsTotalFee float64 `json:"coupons_total_fee"` + SettlementType float64 `json:"settlement_type"` + PckUpCode float64 `json:"pck_up_code"` + CompleteCode float64 `json:"complete_code"` + OverflowFee float64 `json:"overflow_fee"` } // SFCancel 顺丰原因订单取消回调 diff --git a/platformapi/sfps2/sf_test.go b/platformapi/sfps2/sf_test.go index cf58b84c..cba6cf29 100644 --- a/platformapi/sfps2/sf_test.go +++ b/platformapi/sfps2/sf_test.go @@ -7,8 +7,8 @@ import ( "testing" ) -//var api = New(AppID, AppKey)//测试 -var api = New(AppID2, AppKey2) //正式 +var api = New(AppID, AppKey) //测试 +//var api = New(AppID2, AppKey2) //正式 const ( //正式环境 @@ -64,11 +64,13 @@ func TestCreateOrder(t *testing.T) { param := &CreateOrderReq{ DevId: AppID, ShopId: TestSFStoreID, - ShopOrderId: "20230525Test", + ShopType: 1, + ShopOrderId: "20230908Test", OrderSequence: "测试", OrderSource: OrderSourceELM, - OrderTime: 1684997166, - PushTime: 1684997166, + OrderTime: 1694163550, + LbsType: LbsTypeGD, + PushTime: 1694163550, Version: 19, ReturnFlag: 511, Receive: &ReceiveAddress{