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

1

Browse Source
This commit is contained in:
邹宗楠
2022-11-25 14:17:06 +08:00
parent 6ac39c8a9c
commit 7951af8df8
3 changed files with 58 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platformapi/recharge_phone_bill/recharge.go
View File

@@ -105,7 +105,7 @@ func (a *API) QueryOrderDetail(orderNumber, userOrderNum string) ([]QueryOrderDe
// QueryAccountBill 余额查询 // QueryAccountBill 余额查询
func (a *API) QueryAccountBill() (string, error) { func (a *API) QueryAccountBill() (string, error) {
data, err := a.AccessAPI(BaseUrl, QueryAccountBill, http.MethodPost, nil) data, err := a.AccessAPI(BaseUrl, QueryAccountBill, http.MethodPost, map[string]interface{}{})
if err != nil { if err != nil {
return "", err return "", err
} }

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

@@ -481,137 +481,137 @@ func (a *API) CreateOrderCallback(orderStatus []byte) (map[string][]interface{},
} }
// GetCallbackOrderId 获取回调函数订单id // GetCallbackOrderId 获取回调函数订单id
func (a *API) GetCallbackOrderId(msgId string, data interface{}) (string, *CallbackResponse) { func (a *API) GetCallbackOrderId(msgId string, data interface{}) (string, int64, *CallbackResponse) {
switch msgId { switch msgId {
case CallbackCreatedOrderMsgTagId: // 创建订单 case CallbackCreatedOrderMsgTagId: // 创建订单
create := CreateOrderData{} create := CreateOrderData{}
if err := utils.Map2StructByJson(data, &create, false); err != nil { if err := utils.Map2StructByJson(data, &create, false); err != nil {
return "", Err2CallbackResponse(err, "") return "", 0, Err2CallbackResponse(err, "")
} }
return utils.Int64ToStr(create.PId), Err2CallbackResponse(nil, "") return utils.Int64ToStr(create.PId), create.ShopId, Err2CallbackResponse(nil, "")
case CallbackPayOrderMsgTagId: // 支付订单 case CallbackPayOrderMsgTagId: // 支付订单
create := PayOrderData{} create := PayOrderData{}
if err := utils.Map2StructByJson(data, &create, false); err != nil { if err := utils.Map2StructByJson(data, &create, false); err != nil {
return "", CallbackResponseErr(false) return "", 0, CallbackResponseErr(false)
} }
return utils.Int64ToStr(create.PId), Err2CallbackResponse(nil, "") return utils.Int64ToStr(create.PId), create.ShopId, Err2CallbackResponse(nil, "")
case CallbackWaitOrderMsgTagId: // 支付订单待处理(风控审核) case CallbackWaitOrderMsgTagId: // 支付订单待处理(风控审核)
create := WaitOrderData{} create := WaitOrderData{}
if err := utils.Map2StructByJson(data, &create, false); err != nil { if err := utils.Map2StructByJson(data, &create, false); err != nil {
return "", CallbackResponseErr(false) return "", 0, CallbackResponseErr(false)
} }
return utils.Int64ToStr(create.PId), Err2CallbackResponse(nil, "") return utils.Int64ToStr(create.PId), create.ShopId, Err2CallbackResponse(nil, "")
case CallbackPartGoodsMsgTagId: // 卖家部分发货 case CallbackPartGoodsMsgTagId: // 卖家部分发货
create := SomeSendOrderData{} create := SomeSendOrderData{}
if err := utils.Map2StructByJson(data, &create, false); err != nil { if err := utils.Map2StructByJson(data, &create, false); err != nil {
return "", CallbackResponseErr(false) return "", 0, CallbackResponseErr(false)
} }
return utils.Int64ToStr(create.PId), Err2CallbackResponse(nil, "") return utils.Int64ToStr(create.PId), create.ShopId, Err2CallbackResponse(nil, "")
case CallbackPartAllGoodsMsgTagId: // 卖家发货 case CallbackPartAllGoodsMsgTagId: // 卖家发货
create := BusinessDeliveryData{} create := BusinessDeliveryData{}
if err := utils.Map2StructByJson(data, &create, false); err != nil { if err := utils.Map2StructByJson(data, &create, false); err != nil {
return "", CallbackResponseErr(false) return "", 0, CallbackResponseErr(false)
} }
return utils.Int64ToStr(create.PId), Err2CallbackResponse(nil, "") return utils.Int64ToStr(create.PId), create.ShopId, Err2CallbackResponse(nil, "")
case CallbackCancelOrderMsgTagId: // 取消订单 case CallbackCancelOrderMsgTagId: // 取消订单
create := CancelOrderData{} create := CancelOrderData{}
if err := utils.Map2StructByJson(data, &create, false); err != nil { if err := utils.Map2StructByJson(data, &create, false); err != nil {
return "", CallbackResponseErr(false) return "", 0, CallbackResponseErr(false)
} }
return utils.Int64ToStr(create.PId), Err2CallbackResponse(nil, "") return utils.Int64ToStr(create.PId), create.ShopId, Err2CallbackResponse(nil, "")
case CallbackSuccessOrderMsgTagId: // 卖家确认收货时,会自动完成 case CallbackSuccessOrderMsgTagId: // 卖家确认收货时,会自动完成
create := SuccessOrderData{} create := SuccessOrderData{}
if err := utils.Map2StructByJson(data, &create, false); err != nil { if err := utils.Map2StructByJson(data, &create, false); err != nil {
return "", CallbackResponseErr(false) return "", 0, CallbackResponseErr(false)
} }
return utils.Int64ToStr(create.PId), Err2CallbackResponse(nil, "") return utils.Int64ToStr(create.PId), create.ShopId, Err2CallbackResponse(nil, "")
case CallbackWayBillChangeOrderMsgTagId: // 发货物流消息便跟 case CallbackWayBillChangeOrderMsgTagId: // 发货物流消息便跟
create := WayBillChangeData{} create := WayBillChangeData{}
if err := utils.Map2StructByJson(data, &create, false); err != nil { if err := utils.Map2StructByJson(data, &create, false); err != nil {
return "", CallbackResponseErr(false) return "", 0, CallbackResponseErr(false)
} }
return utils.Int64ToStr(create.PId), Err2CallbackResponse(nil, "") return utils.Int64ToStr(create.PId), create.ShopId, Err2CallbackResponse(nil, "")
case CallbackReceivingChangeOrderMsgTagId: // 收货地址消息变更(商家审核通过触发) case CallbackReceivingChangeOrderMsgTagId: // 收货地址消息变更(商家审核通过触发)
create := ReceivingAddressChangeData{} create := ReceivingAddressChangeData{}
if err := utils.Map2StructByJson(data, &create, false); err != nil { if err := utils.Map2StructByJson(data, &create, false); err != nil {
return "", CallbackResponseErr(false) return "", 0, CallbackResponseErr(false)
} }
return utils.Int64ToStr(create.PId), Err2CallbackResponse(nil, "") return utils.Int64ToStr(create.PId), create.ShopId, Err2CallbackResponse(nil, "")
case CallbackChangeMoneyMsgTagId: // 卖家修改订单/运单金额回调 case CallbackChangeMoneyMsgTagId: // 卖家修改订单/运单金额回调
create := UpdateAmountChangeData{} create := UpdateAmountChangeData{}
if err := utils.Map2StructByJson(data, &create, false); err != nil { if err := utils.Map2StructByJson(data, &create, false); err != nil {
return "", CallbackResponseErr(false) return "", 0, CallbackResponseErr(false)
} }
return utils.Int64ToStr(create.PId), Err2CallbackResponse(nil, "") return utils.Int64ToStr(create.PId), create.ShopId, Err2CallbackResponse(nil, "")
case CallbackBusinessRemarkMsgTagId: // 买家收货消息变更(手机,地址,姓名),用户C端修改触发(需要上面审核接口) case CallbackBusinessRemarkMsgTagId: // 买家收货消息变更(手机,地址,姓名),用户C端修改触发(需要上面审核接口)
create := BuyerUpdateWayBillData{} create := BuyerUpdateWayBillData{}
if err := utils.Map2StructByJson(data, &create, false); err != nil { if err := utils.Map2StructByJson(data, &create, false); err != nil {
return "", CallbackResponseErr(false) return "", 0, CallbackResponseErr(false)
} }
return utils.Int64ToStr(create.PId), Err2CallbackResponse(nil, "") return utils.Int64ToStr(create.PId), create.ShopId, Err2CallbackResponse(nil, "")
case CallbackApplyUpdateAddressMsgTagId: // 商家修改交易备注回调 case CallbackApplyUpdateAddressMsgTagId: // 商家修改交易备注回调
create := BusinessUpdateRemakeData{} create := BusinessUpdateRemakeData{}
if err := utils.Map2StructByJson(data, &create, false); err != nil { if err := utils.Map2StructByJson(data, &create, false); err != nil {
return "", CallbackResponseErr(false) return "", 0, CallbackResponseErr(false)
} }
return utils.Int64ToStr(create.PId), Err2CallbackResponse(nil, "") return utils.Int64ToStr(create.PId), create.ShopId, Err2CallbackResponse(nil, "")
case CallbackSendOrderTimeChangeMsgTagId: // 订单发货时消息变更回调 case CallbackSendOrderTimeChangeMsgTagId: // 订单发货时消息变更回调
create := AppointmentChangeData{} create := AppointmentChangeData{}
if err := utils.Map2StructByJson(data, &create, false); err != nil { if err := utils.Map2StructByJson(data, &create, false); err != nil {
return "", CallbackResponseErr(false) return "", 0, CallbackResponseErr(false)
} }
return create.PId, Err2CallbackResponse(nil, "") return create.PId, create.ShopId, Err2CallbackResponse(nil, "")
/*********下面属于订单退货消息************/ /*********下面属于订单退货消息************/
case CallbackRefundOrderMsgTagId: // 买家发起售后申请消息 case CallbackRefundOrderMsgTagId: // 买家发起售后申请消息
create := BuyerRefundCreatedData{} create := BuyerRefundCreatedData{}
if err := utils.Map2StructByJson(data, &create, false); err != nil { if err := utils.Map2StructByJson(data, &create, false); err != nil {
return "", CallbackResponseErr(false) return "", 0, CallbackResponseErr(false)
} }
return utils.Int64ToStr(create.PId), Err2CallbackResponse(nil, "") return utils.Int64ToStr(create.PId), int64(create.ShopId), Err2CallbackResponse(nil, "")
case CallbackUpdateRefundOrderMsgTagId: // 买家修改售后申请消息 case CallbackUpdateRefundOrderMsgTagId: // 买家修改售后申请消息
create := BuyerRefundModifiedData{} create := BuyerRefundModifiedData{}
if err := utils.Map2StructByJson(data, &create, false); err != nil { if err := utils.Map2StructByJson(data, &create, false); err != nil {
return "", CallbackResponseErr(false) return "", 0, CallbackResponseErr(false)
} }
return utils.Int64ToStr(create.PId), Err2CallbackResponse(nil, "") return utils.Int64ToStr(create.PId), int64(create.ShopId), Err2CallbackResponse(nil, "")
case CallbackRefundOrderSuccessMsgTagId: // 退款成功消息 case CallbackRefundOrderSuccessMsgTagId: // 退款成功消息
create := BusinessRefundSuccessData{} create := BusinessRefundSuccessData{}
if err := utils.Map2StructByJson(data, &create, false); err != nil { if err := utils.Map2StructByJson(data, &create, false); err != nil {
return "", CallbackResponseErr(false) return "", 0, CallbackResponseErr(false)
} }
return utils.Int64ToStr(create.PId), Err2CallbackResponse(nil, "") return utils.Int64ToStr(create.PId), int64(create.ShopId), Err2CallbackResponse(nil, "")
case CallbackRefundOrderRefuseMsgTagId: // 拒绝退款消息 case CallbackRefundOrderRefuseMsgTagId: // 拒绝退款消息
create := BusinessNotRefundRefusedData{} create := BusinessNotRefundRefusedData{}
if err := utils.Map2StructByJson(data, &create, false); err != nil { if err := utils.Map2StructByJson(data, &create, false); err != nil {
return "", CallbackResponseErr(false) return "", 0, CallbackResponseErr(false)
} }
return utils.Int64ToStr(create.PId), Err2CallbackResponse(nil, "") return utils.Int64ToStr(create.PId), int64(create.ShopId), Err2CallbackResponse(nil, "")
case CallbackRefundShopMsgTagId: // 拒绝退货申请消息 case CallbackRefundShopMsgTagId: // 拒绝退货申请消息
create := BusinessNotReturnApplyRefusedData{} create := BusinessNotReturnApplyRefusedData{}
if err := utils.Map2StructByJson(data, &create, false); err != nil { if err := utils.Map2StructByJson(data, &create, false); err != nil {
return "", CallbackResponseErr(false) return "", 0, CallbackResponseErr(false)
} }
return utils.Int64ToStr(create.PId), Err2CallbackResponse(nil, "") return utils.Int64ToStr(create.PId), int64(create.ShopId), Err2CallbackResponse(nil, "")
case CallbackReturnApplyAgreedMsgTagId: // 卖家同意时，推送此消息 case CallbackReturnApplyAgreedMsgTagId: // 卖家同意时，推送此消息
create := BusinessReturnApplyAgreedData{} create := BusinessReturnApplyAgreedData{}
if err := utils.Map2StructByJson(data, &create, false); err != nil { if err := utils.Map2StructByJson(data, &create, false); err != nil {
return "", CallbackResponseErr(false) return "", 0, CallbackResponseErr(false)
} }
return utils.Int64ToStr(create.PId), Err2CallbackResponse(nil, "") return utils.Int64ToStr(create.PId), int64(create.ShopId), Err2CallbackResponse(nil, "")
case CallbackReturnRefundAgreedMsgTagId: // 同意退款消息 case CallbackReturnRefundAgreedMsgTagId: // 同意退款消息
create := AppointmentChangeData{} create := AppointmentChangeData{}
if err := utils.Map2StructByJson(data, &create, false); err != nil { if err := utils.Map2StructByJson(data, &create, false); err != nil {
return "", CallbackResponseErr(false) return "", 0, CallbackResponseErr(false)
} }
return create.PId, Err2CallbackResponse(nil, "") return create.PId, create.ShopId, Err2CallbackResponse(nil, "")
case CallbackRefundClosedMsgTagId: // 当买家取消申请或系统超时机制导致退款取消时，会推送此消息 case CallbackRefundClosedMsgTagId: // 当买家取消申请或系统超时机制导致退款取消时，会推送此消息
create := UserCancelRefundOrderData{} create := UserCancelRefundOrderData{}
if err := utils.Map2StructByJson(data, &create, false); err != nil { if err := utils.Map2StructByJson(data, &create, false); err != nil {
return "", CallbackResponseErr(false) return "", 0, CallbackResponseErr(false)
} }
return utils.Int64ToStr(create.PId), Err2CallbackResponse(nil, "") return utils.Int64ToStr(create.PId), int64(create.ShopId), Err2CallbackResponse(nil, "")
default: default:
return "", CallbackResponseErr(false) return "", 0, CallbackResponseErr(false)
} }
} }

13
utils/utils_test.go
View File

@@ -276,3 +276,16 @@ func TestGenerateGetURL(t *testing.T) {
t.Fatal("GenerateGetURL错误") t.Fatal("GenerateGetURL错误")
} }
} }
func TestUtilsIsNil(t *testing.T) {
param := make(map[string]interface{}, 0)
param["aaa"] = "1"
param["bbb"] = ""
param["ccc"] = nil
fmt.Println(param["aaa"] == nil)
fmt.Println(param["bbb"] == nil)
fmt.Println(param["ccc"] == nil)
fmt.Println(param["bbb"] == "")
fmt.Println(param["kkk"] == "")
}