liulei/baseapi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/rosydev/baseapi

Browse Source
This commit is contained in:
richboo111
2022-11-02 16:47:10 +08:00
parent 2a7b179c61 7949539a91
commit 51a5f88212
7 changed files with 46 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platformapi/dadaapi/order.go
View File

@@ -23,11 +23,10 @@ const (
OrderStatusDelivering = 3 // 配送中 OrderStatusDelivering = 3 // 配送中
OrderStatusFinished = 4 // 已完成 OrderStatusFinished = 4 // 已完成
OrderStatusCanceled = 5 // 已取消 OrderStatusCanceled = 5 // 已取消
OrderStatusExpired = 7 //
OrderStatusAssignment = 8 // 指派单 OrderStatusAssignment = 8 // 指派单
OrderStatusReturning = 9 // 妥投异常之物品返回中 OrderStatusReturning = 9 // 妥投异常之物品返回中
OrderStatusReturningFinished = 10 // 妥投异常之物品返回完成 OrderStatusReturningFinished = 10 // 妥投异常之物品返回完成
OrderStatusReturningInOrder = 100 // 妥投异常之物品返回完成 OrderStatusReturningInOrder = 100 // 骑手到店
OrderStatusAddOrderFailed = 1000 // ,创建达达运单失败 OrderStatusAddOrderFailed = 1000 // ,创建达达运单失败
) )

11
platformapi/mtpsapi/mtpsapi.go
View File

@@ -18,11 +18,12 @@ const (
) )
const ( const (
OrderStatusWaitingForSchedule = 0 // 0：待调度 OrderStatusWaitingForSchedule = 0 // 0：待调度
OrderStatusAccepted = 20 // 20：已接单 OrderStatusAccepted = 20 // 20：已接单
OrderStatusPickedUp = 30 // 30：已取货 OrderStatusPickedUp = 30 // 30：已取货
OrderStatusDeliverred = 50 // 50：已送达 OrderStatusDeliverred = 50 // 50：已送达
OrderStatusCanceled = 99 // 99：已取消 OrderStatusCanceled = 99 // 99：已取消
OrderStatusFakeToStore = 200 // 自定义假的到店
) )
const ( const (

2
platformapi/mtpsapi/riderInfo.go
View File

@@ -13,7 +13,7 @@ type RiderInfo struct {
CourierName string `json:"courier_name"` // 骑手名称 CourierName string `json:"courier_name"` // 骑手名称
CourierPhone string `json:"courier_phone"` // 骑手电话 CourierPhone string `json:"courier_phone"` // 骑手电话
LogisticsProviderCode string `json:"logistics_provider_code"` // 配送平台code 10001-顺丰, 10002-达达, 10003-闪送, 10004-蜂鸟, 10005 UU跑腿,10006 快跑者, 10007 极客快送,10008-点我达,10009 同达, 10010-生活半径,10011 邻趣,10012 趣送, 10013 快服务 10014 菜鸟新配盟 10015 商家自建配送 10016 风先生,10017-其他,10032-美团跑腿 LogisticsProviderCode string `json:"logistics_provider_code"` // 配送平台code 10001-顺丰, 10002-达达, 10003-闪送, 10004-蜂鸟, 10005 UU跑腿,10006 快跑者, 10007 极客快送,10008-点我达,10009 同达, 10010-生活半径,10011 邻趣,10012 趣送, 10013 快服务 10014 菜鸟新配盟 10015 商家自建配送 10016 风先生,10017-其他,10032-美团跑腿
LogisticsStatus int `json:"logistics_status"` // 配送状态 LogisticsStatus int `json:"logistics_status"` // 配送状态(美团用)
LogisticsContext string `json:"logistics_context"` // 配送状态描述 LogisticsContext string `json:"logistics_context"` // 配送状态描述
Latitude string `json:"latitude"` // 骑手当前的纬度，美团使用的是高德坐标系。 Latitude string `json:"latitude"` // 骑手当前的纬度，美团使用的是高德坐标系。
Longitude string `json:"longitude"` // 骑手当前的经度，美团使用的是高德坐标系。 Longitude string `json:"longitude"` // 骑手当前的经度，美团使用的是高德坐标系。

9
platformapi/tiktok_shop/tiktok_api/afs_test.go
View File

@@ -5,10 +5,11 @@ import (
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals"
"testing" "testing"
"time"
) )
var token = `{"access_token":"c4afc5bc-7ddf-4244-b35a-0c393f3dca32","expires_in":1667203717,"scope":"SCOPE","shop_id":57939570,"shop_name":"京西菜市速食","refresh_token":"5a4f9dfe-306b-4bca-8b35-2ae9afc0245e","authority_id":""}` var token = `{"access_token":"d590b649-0dd9-4988-a5e2-bf7e06e2f105","expires_in":1667808519,"scope":"SCOPE","shop_id":57939570,"shop_name":"京西菜市速食","refresh_token":"f57c6a55-af5f-45ca-8ade-b2282be86341","authority_id":""}`
var a = New("7136048270014416392", "c397aa9f-3927-47c4-8cfe-4d84e02602e0", "") var a = New("7136048270014416392", "c397aa9f-3927-47c4-8cfe-4d84e02602e0", token)
// 查询售后单详情 // 查询售后单详情
func TestAfsOrder(t *testing.T) { func TestAfsOrder(t *testing.T) {
@@ -17,7 +18,7 @@ func TestAfsOrder(t *testing.T) {
// 同意/拒绝售后单 // 同意/拒绝售后单
func TestAggreOrNotAggreAfs(t *testing.T) { func TestAggreOrNotAggreAfs(t *testing.T) {
a.AfterSaleOperate(int32(201), "4994452108005135590", "1", 0) a.AfterSaleOperate(int32(202), "7161251923629179177", "1", 0)
fmt.Println("11", 8|16|32|1) fmt.Println("11", 8|16|32|1)
} }
@@ -29,5 +30,5 @@ func TestGetSkuDetailLocalID(t *testing.T) {
// //
func TestName(t *testing.T) { func TestName(t *testing.T) {
a.GetSkuDetail("3579733194175557759", "") // 主品 fmt.Println(time.Now().Day())
} }

9
platformapi/tiktok_shop/tiktok_api/order.go
View File

@@ -145,7 +145,8 @@ func (a *API) AfterSaleOperate(refundType int32, refundId, remark string, storeI
paramList.RejectReasonCode = reasonItem[0].RejectReasonCode paramList.RejectReasonCode = reasonItem[0].RejectReasonCode
paramList.Reason = reasonItem[0].Reason paramList.Reason = reasonItem[0].Reason
paramList.Remark = remark paramList.Remark = remark
// 111同意退货（二次审核） 121退货转退款 201同意仅退款 203同意拒签后退款 321换货转退款 401同意售前退申请 501同意补寄 502 拒绝补寄 refundListParam = append(refundListParam, paramList)
// 111同意退货（二次审核） 121退货转退款 201同意仅退款 203同意拒签后退款 321换货转退款 401同意售前退申请 501同意补寄 502 拒绝补寄
case AfterSaleEmuAgreeToReturnTwoApply, AfterSaleEmuReturnGoodsToRefundApply, AfterSaleEmuAgreeOnlyRefundApply, AfterSaleEmuRefundAfterRefusalApply, AfterSaleEmuChangeGoodsToRefundApply, AfterSaleEmuAgreePreSaleReturnApply, AfterSaleEmuAgreeReissueApply, AfterSaleEmuRefundReissueApply: case AfterSaleEmuAgreeToReturnTwoApply, AfterSaleEmuReturnGoodsToRefundApply, AfterSaleEmuAgreeOnlyRefundApply, AfterSaleEmuRefundAfterRefusalApply, AfterSaleEmuChangeGoodsToRefundApply, AfterSaleEmuAgreePreSaleReturnApply, AfterSaleEmuAgreeReissueApply, AfterSaleEmuRefundReissueApply:
var paramList = afterSale_operate_request.ItemsItem{} var paramList = afterSale_operate_request.ItemsItem{}
paramList.AftersaleId = refundId paramList.AftersaleId = refundId
@@ -604,6 +605,12 @@ func (a *API) GetCallbackOrderId(msgId string, data interface{}) (string, *Callb
return "", CallbackResponseErr(false) return "", CallbackResponseErr(false)
} }
return create.PId, Err2CallbackResponse(nil, "") return create.PId, Err2CallbackResponse(nil, "")
case CallbackRefundClosedMsgTagId: // 当买家取消申请或系统超时机制导致退款取消时，会推送此消息
create := UserCancelRefundOrderData{}
if err := utils.Map2StructByJson(data, &create, false); err != nil {
return "", CallbackResponseErr(false)
}
return utils.Int64ToStr(create.PId), Err2CallbackResponse(nil, "")
default: default:
return "", CallbackResponseErr(false) return "", CallbackResponseErr(false)
} }

24
platformapi/tiktok_shop/tiktok_api/order_type.go
View File

@@ -316,6 +316,30 @@ type AppointmentChangeData struct {
//#endregion //#endregion
//#region 当买家取消申请或系统超时机制导致退款取消时，会推送此消息
type UserCancelRefundOrderCallback struct {
PublicOrderCallback
Data *UserCancelRefundOrderData `json:"data"`
}
type UserCancelRefundOrderData struct {
AftersaleId int64 `json:"aftersale_id"` // 售后单ID
AftersaleStatus int `json:"aftersale_status"` // 售后状态：6-售后申请；27-拒绝售后申请；12-售后成功；7-售后退货中；11-售后已发货；29-售后退货拒绝；13-【换货返回：换货售后换货商家发货】，【补寄返回：补寄待用户收货】； 14-【换货返回：（换货）售后换货用户收货】，【补寄返回：（补寄）用户已收货】 ；28-售后失败；51-订单取消成功；53-逆向交易已完成；
AftersaleType int `json:"aftersale_type"` // 售后类型： 0: 退货 1: 售后仅退款 2: 发货前整单退款
CloseTime int `json:"close_time"` // 退款成功时间
PId int64 `json:"p_id"` // 父订单ID
ReasonCode int `json:"reason_code"` // 原因码
RefundAmount int `json:"refund_amount"` // 申请退款的金额（含运费）
RefundPostAmount int `json:"refund_post_amount"` // 申请退的运费金额
RefundVoucherNum int `json:"refund_voucher_num"` // 申请退款的卡券的数量
SId int64 `json:"s_id"` // 子订单ID
ShopId int `json:"shop_id"` // 店铺ID
UpdateTime time.Time `json:"update_time"` // 售后单更新时间
}
//#endregion
//#region 假的拣货完成 //#region 假的拣货完成
type FakePickUpGoodsCallback struct { type FakePickUpGoodsCallback struct {
PublicOrderCallback PublicOrderCallback

2
platformapi/tiktok_shop/tiktok_api/order_type_const.go
View File

@@ -115,7 +115,7 @@ const (
CallbackArbitrateSubmitingMsgTagId = "213" // 客服要求商家上传凭证消息 CallbackArbitrateSubmitingMsgTagId = "213" // 客服要求商家上传凭证消息
CallbackArbitrateAppliedMsgTagId = "212" // 买家发起客服仲裁消息 CallbackArbitrateAppliedMsgTagId = "212" // 买家发起客服仲裁消息
CallbackExpirationChangeMsgTagId = "209" // 售后超时时长变更消息 CallbackExpirationChangeMsgTagId = "209" // 售后超时时长变更消息
CallbackRefundClosedMsgTagId = "207" // 售后关闭消息 CallbackRefundClosedMsgTagId = "207" // 售后关闭消息,当买家取消申请或系统超时机制导致退款取消时，会推送此消息
CallbackBuyerReturnGoodsMsgTagId = "203" // 买家退货给卖家消息 CallbackBuyerReturnGoodsMsgTagId = "203" // 买家退货给卖家消息
CallbackSpecialRefundMsgTagId = "224" // 特殊权益售后消息 CallbackSpecialRefundMsgTagId = "224" // 特殊权益售后消息
CallbackSpecialRefundSuccessMsgTagId = "225" // 特殊权益售后退款成功消息 CallbackSpecialRefundSuccessMsgTagId = "225" // 特殊权益售后退款成功消息