This commit is contained in:
邹宗楠
2022-10-12 18:38:03 +08:00
parent df7ab546bf
commit 089d73664a
2 changed files with 64 additions and 104 deletions

View File

@@ -335,167 +335,127 @@ func (a *API) CreateOrderCallback(orderStatus []byte) (map[string][]interface{},
for _, data := range resp { for _, data := range resp {
switch data.Tag { switch data.Tag {
case CallbackCreatedOrderMsgTagId: // 创建订单 case CallbackCreatedOrderMsgTagId: // 创建订单
create := []CreateOrderCallback{} create := CreateOrderData{}
if err := json.Unmarshal(orderStatus, &create); err != nil { if err := json.Unmarshal([]byte(data.Data), &create); err != nil {
return nil, CallbackResponseErr(false) return nil, CallbackResponseErr(false)
} }
for _, v := range create { callbackResult[CallbackCreatedOrderMsgTagId] = append(callbackResult[CallbackCreatedOrderMsgTagId], create)
callbackResult[CallbackCreatedOrderMsgTagId] = append(callbackResult[CallbackCreatedOrderMsgTagId], v.Data)
}
case CallbackPayOrderMsgTagId: // 支付订单 case CallbackPayOrderMsgTagId: // 支付订单
create := []PayOrderCallback{} create := PayOrderData{}
if err := json.Unmarshal(orderStatus, &create); err != nil { if err := json.Unmarshal([]byte(data.Data), &create); err != nil {
return nil, CallbackResponseErr(false) return nil, CallbackResponseErr(false)
} }
for _, v := range create { callbackResult[CallbackPayOrderMsgTagId] = append(callbackResult[CallbackPayOrderMsgTagId], create)
callbackResult[CallbackPayOrderMsgTagId] = append(callbackResult[CallbackPayOrderMsgTagId], v.Data)
}
globals.SugarLogger.Debugf("CallbackPayOrderMsgTagId======%s", utils.Format4Output(callbackResult, false)) globals.SugarLogger.Debugf("CallbackPayOrderMsgTagId======%s", utils.Format4Output(callbackResult, false))
case CallbackWaitOrderMsgTagId: // 支付订单待处理(风控审核) case CallbackWaitOrderMsgTagId: // 支付订单待处理(风控审核)
create := []WaitOrderCallback{} create := WaitOrderData{}
if err := json.Unmarshal(orderStatus, &create); err != nil { if err := json.Unmarshal([]byte(data.Data), &create); err != nil {
return nil, CallbackResponseErr(false) return nil, CallbackResponseErr(false)
} }
for _, v := range create { callbackResult[CallbackWaitOrderMsgTagId] = append(callbackResult[CallbackWaitOrderMsgTagId], create)
callbackResult[CallbackWaitOrderMsgTagId] = append(callbackResult[CallbackWaitOrderMsgTagId], v.Data)
}
case CallbackPartGoodsMsgTagId: // 卖家部分发货 case CallbackPartGoodsMsgTagId: // 卖家部分发货
create := []SomeSendOrderCallback{} create := SomeSendOrderData{}
if err := json.Unmarshal(orderStatus, &create); err != nil { if err := json.Unmarshal([]byte(data.Data), &create); err != nil {
return nil, CallbackResponseErr(false) return nil, CallbackResponseErr(false)
} }
for _, v := range create { callbackResult[CallbackPartGoodsMsgTagId] = append(callbackResult[CallbackPartGoodsMsgTagId], create)
callbackResult[CallbackPartGoodsMsgTagId] = append(callbackResult[CallbackPartGoodsMsgTagId], v.Data)
}
case CallbackPartAllGoodsMsgTagId: // 卖家发货 case CallbackPartAllGoodsMsgTagId: // 卖家发货
create := []BusinessDeliveryCallback{} create := BusinessDeliveryData{}
if err := json.Unmarshal(orderStatus, &create); err != nil { if err := json.Unmarshal([]byte(data.Data), &create); err != nil {
return nil, CallbackResponseErr(false) return nil, CallbackResponseErr(false)
} }
for _, v := range create { callbackResult[CallbackPartAllGoodsMsgTagId] = append(callbackResult[CallbackPartAllGoodsMsgTagId], create)
callbackResult[CallbackPartAllGoodsMsgTagId] = append(callbackResult[CallbackPartAllGoodsMsgTagId], v.data)
}
case CallbackCancelOrderMsgTagId: // 取消订单 case CallbackCancelOrderMsgTagId: // 取消订单
create := []CancelOrderCallback{} create := CreateOrderData{}
if err := json.Unmarshal(orderStatus, &create); err != nil { if err := json.Unmarshal([]byte(data.Data), &create); err != nil {
return nil, CallbackResponseErr(false) return nil, CallbackResponseErr(false)
} }
for _, v := range create { callbackResult[CallbackCancelOrderMsgTagId] = append(callbackResult[CallbackCancelOrderMsgTagId], create)
callbackResult[CallbackCancelOrderMsgTagId] = append(callbackResult[CallbackCancelOrderMsgTagId], v.Data)
}
case CallbackSuccessOrderMsgTagId: // 卖家确认收货时,会自动完成 case CallbackSuccessOrderMsgTagId: // 卖家确认收货时,会自动完成
create := []SuccessOrderCallback{} create := SuccessOrderData{}
if err := json.Unmarshal(orderStatus, &create); err != nil { if err := json.Unmarshal([]byte(data.Data), &create); err != nil {
return nil, CallbackResponseErr(false) return nil, CallbackResponseErr(false)
} }
for _, v := range create { callbackResult[CallbackSuccessOrderMsgTagId] = append(callbackResult[CallbackSuccessOrderMsgTagId], create)
callbackResult[CallbackSuccessOrderMsgTagId] = append(callbackResult[CallbackSuccessOrderMsgTagId], v.Data)
}
case CallbackWayBillChangeOrderMsgTagId: // 发货物流消息便跟 case CallbackWayBillChangeOrderMsgTagId: // 发货物流消息便跟
create := []WayBillChangeCallback{} create := WayBillChangeData{}
if err := json.Unmarshal(orderStatus, &create); err != nil { if err := json.Unmarshal([]byte(data.Data), &create); err != nil {
return nil, CallbackResponseErr(false) return nil, CallbackResponseErr(false)
} }
for _, v := range create { callbackResult[CallbackWayBillChangeOrderMsgTagId] = append(callbackResult[CallbackWayBillChangeOrderMsgTagId], create)
callbackResult[CallbackWayBillChangeOrderMsgTagId] = append(callbackResult[CallbackWayBillChangeOrderMsgTagId], v.Data)
}
case CallbackReceivingChangeOrderMsgTagId: // 收货地址消息变更(商家审核通过触发) case CallbackReceivingChangeOrderMsgTagId: // 收货地址消息变更(商家审核通过触发)
create := []ReceivingAddressChangeCallback{} create := ReceivingAddressChangeData{}
if err := json.Unmarshal(orderStatus, &create); err != nil { if err := json.Unmarshal([]byte(data.Data), &create); err != nil {
return nil, CallbackResponseErr(false) return nil, CallbackResponseErr(false)
} }
for _, v := range create { callbackResult[CallbackReceivingChangeOrderMsgTagId] = append(callbackResult[CallbackReceivingChangeOrderMsgTagId], create)
callbackResult[CallbackReceivingChangeOrderMsgTagId] = append(callbackResult[CallbackReceivingChangeOrderMsgTagId], v.Data)
}
case CallbackChangeMoneyMsgTagId: // 卖家修改订单/运单金额回调 case CallbackChangeMoneyMsgTagId: // 卖家修改订单/运单金额回调
create := []UpdateAmountChangeCallback{} create := UpdateAmountChangeData{}
if err := json.Unmarshal([]byte(orderStatus), &create); err != nil { if err := json.Unmarshal([]byte(data.Data), &create); err != nil {
return nil, CallbackResponseErr(false) return nil, CallbackResponseErr(false)
} }
for _, v := range create { callbackResult[CallbackChangeMoneyMsgTagId] = append(callbackResult[CallbackChangeMoneyMsgTagId], create)
callbackResult[CallbackChangeMoneyMsgTagId] = append(callbackResult[CallbackChangeMoneyMsgTagId], v.Data)
}
case CallbackBusinessRemarkMsgTagId: // 买家收货消息变更(手机,地址,姓名),用户C端修改触发(需要上面审核接口) case CallbackBusinessRemarkMsgTagId: // 买家收货消息变更(手机,地址,姓名),用户C端修改触发(需要上面审核接口)
create := []BuyerUpdateWayBillCallback{} create := BuyerUpdateWayBillData{}
if err := json.Unmarshal(orderStatus, create); err != nil { if err := json.Unmarshal([]byte(data.Data), create); err != nil {
return nil, CallbackResponseErr(false) return nil, CallbackResponseErr(false)
} }
for _, v := range create { callbackResult[CallbackBusinessRemarkMsgTagId] = append(callbackResult[CallbackBusinessRemarkMsgTagId], create)
callbackResult[CallbackBusinessRemarkMsgTagId] = append(callbackResult[CallbackBusinessRemarkMsgTagId], v.Data)
}
case CallbackApplyUpdateAddressMsgTagId: // 商家修改交易备注回调 case CallbackApplyUpdateAddressMsgTagId: // 商家修改交易备注回调
create := []BusinessUpdateRemakeCallback{} create := BusinessUpdateRemakeData{}
if err := json.Unmarshal(orderStatus, &create); err != nil { if err := json.Unmarshal([]byte(data.Data), &create); err != nil {
return nil, CallbackResponseErr(false) return nil, CallbackResponseErr(false)
} }
for _, v := range create { callbackResult[CallbackApplyUpdateAddressMsgTagId] = append(callbackResult[CallbackApplyUpdateAddressMsgTagId], create)
callbackResult[CallbackApplyUpdateAddressMsgTagId] = append(callbackResult[CallbackApplyUpdateAddressMsgTagId], v.Data)
}
case CallbackSendOrderTimeChangeMsgTagId: // 订单发货时消息变更回调 case CallbackSendOrderTimeChangeMsgTagId: // 订单发货时消息变更回调
create := []AppointmentChangeCallback{} create := AppointmentChangeData{}
if err := json.Unmarshal(orderStatus, &create); err != nil { if err := json.Unmarshal([]byte(data.Data), &create); err != nil {
return nil, CallbackResponseErr(false) return nil, CallbackResponseErr(false)
} }
for _, v := range create { callbackResult[CallbackSendOrderTimeChangeMsgTagId] = append(callbackResult[CallbackSendOrderTimeChangeMsgTagId], create)
callbackResult[CallbackSendOrderTimeChangeMsgTagId] = append(callbackResult[CallbackSendOrderTimeChangeMsgTagId], v.Data)
}
/*********下面属于订单退货消息************/ /*********下面属于订单退货消息************/
case CallbackRefundOrderMsgTagId: // 买家发起售后申请消息 case CallbackRefundOrderMsgTagId: // 买家发起售后申请消息
create := []BuyerRefundCreatedCallback{} create := BuyerRefundCreatedData{}
if err := json.Unmarshal(orderStatus, &create); err != nil { if err := json.Unmarshal([]byte(data.Data), &create); err != nil {
return nil, CallbackResponseErr(false) return nil, CallbackResponseErr(false)
} }
for _, v := range create { callbackResult[CallbackRefundOrderMsgTagId] = append(callbackResult[CallbackRefundOrderMsgTagId], create)
callbackResult[CallbackRefundOrderMsgTagId] = append(callbackResult[CallbackRefundOrderMsgTagId], v.Data)
}
case CallbackUpdateRefundOrderMsgTagId: // 买家修改售后申请消息 case CallbackUpdateRefundOrderMsgTagId: // 买家修改售后申请消息
create := []BuyerRefundModifiedCallBack{} create := BuyerRefundModifiedData{}
if err := json.Unmarshal(orderStatus, &create); err != nil { if err := json.Unmarshal([]byte(data.Data), &create); err != nil {
return nil, CallbackResponseErr(false) return nil, CallbackResponseErr(false)
} }
for _, v := range create { callbackResult[CallbackUpdateRefundOrderMsgTagId] = append(callbackResult[CallbackUpdateRefundOrderMsgTagId], create)
callbackResult[CallbackUpdateRefundOrderMsgTagId] = append(callbackResult[CallbackUpdateRefundOrderMsgTagId], v.Data)
}
case CallbackRefundOrderSuccessMsgTagId: // 退款成功消息 case CallbackRefundOrderSuccessMsgTagId: // 退款成功消息
create := []BusinessRefundSuccessCallback{} create := BusinessRefundSuccessData{}
if err := json.Unmarshal(orderStatus, &create); err != nil { if err := json.Unmarshal([]byte(data.Data), &create); err != nil {
return nil, CallbackResponseErr(false) return nil, CallbackResponseErr(false)
} }
for _, v := range create { callbackResult[CallbackRefundOrderSuccessMsgTagId] = append(callbackResult[CallbackRefundOrderSuccessMsgTagId], create)
callbackResult[CallbackRefundOrderSuccessMsgTagId] = append(callbackResult[CallbackRefundOrderSuccessMsgTagId], v.Data)
}
case CallbackRefundOrderRefuseMsgTagId: // 拒绝退款消息 case CallbackRefundOrderRefuseMsgTagId: // 拒绝退款消息
create := []BusinessNotRefundRefusedCallBack{} create := BusinessNotRefundRefusedData{}
if err := json.Unmarshal(orderStatus, &create); err != nil { if err := json.Unmarshal([]byte(data.Data), &create); err != nil {
return nil, CallbackResponseErr(false) return nil, CallbackResponseErr(false)
} }
for _, v := range create { callbackResult[CallbackRefundOrderRefuseMsgTagId] = append(callbackResult[CallbackRefundOrderRefuseMsgTagId], create)
callbackResult[CallbackRefundOrderRefuseMsgTagId] = append(callbackResult[CallbackRefundOrderRefuseMsgTagId], v.Data)
}
case CallbackRefundShopMsgTagId: // 拒绝退货申请消息 case CallbackRefundShopMsgTagId: // 拒绝退货申请消息
create := []BusinessNotReturnApplyRefusedCallBack{} create := BusinessNotReturnApplyRefusedData{}
if err := json.Unmarshal(orderStatus, &create); err != nil { if err := json.Unmarshal([]byte(data.Data), &create); err != nil {
return nil, CallbackResponseErr(false) return nil, CallbackResponseErr(false)
} }
for _, v := range create { callbackResult[CallbackRefundShopMsgTagId] = append(callbackResult[CallbackRefundShopMsgTagId], create)
callbackResult[CallbackRefundShopMsgTagId] = append(callbackResult[CallbackRefundShopMsgTagId], v.Data)
}
case CallbackReturnApplyAgreedMsgTagId: // 卖家同意时,推送此消息 case CallbackReturnApplyAgreedMsgTagId: // 卖家同意时,推送此消息
create := []BusinessReturnApplyAgreedCallback{} create := BusinessReturnApplyAgreedData{}
if err := json.Unmarshal(orderStatus, &create); err != nil { if err := json.Unmarshal([]byte(data.Data), &create); err != nil {
return nil, CallbackResponseErr(false) return nil, CallbackResponseErr(false)
} }
for _, v := range create { callbackResult[CallbackReturnApplyAgreedMsgTagId] = append(callbackResult[CallbackReturnApplyAgreedMsgTagId], create)
callbackResult[CallbackReturnApplyAgreedMsgTagId] = append(callbackResult[CallbackReturnApplyAgreedMsgTagId], v.Data)
}
case CallbackReturnRefundAgreedMsgTagId: // 同意退款消息 case CallbackReturnRefundAgreedMsgTagId: // 同意退款消息
create := []BusinessRefundAgreedCallback{} create := BusinessRefundAgreedData{}
if err := json.Unmarshal(orderStatus, &create); err != nil { if err := json.Unmarshal([]byte(data.Data), &create); err != nil {
return nil, CallbackResponseErr(false) return nil, CallbackResponseErr(false)
} }
for _, v := range create { callbackResult[CallbackReturnRefundAgreedMsgTagId] = append(callbackResult[CallbackReturnRefundAgreedMsgTagId], create)
callbackResult[CallbackReturnRefundAgreedMsgTagId] = append(callbackResult[CallbackReturnRefundAgreedMsgTagId], v.Data)
}
default: default:
return nil, CallbackResponseErr(false) return nil, CallbackResponseErr(false)
} }

View File

@@ -19,7 +19,7 @@ type PublicOrderCallback struct {
type OrderCallback struct { type OrderCallback struct {
Tag string `json:"tag"` // 消息种类订单创建消息的tag值为"100" Tag string `json:"tag"` // 消息种类订单创建消息的tag值为"100"
MsgId string `json:"msg_id"` //消息记录id MsgId string `json:"msg_id"` //消息记录id
Data interface{} `json:"data"` // 消息正文 Data string `json:"data"` // 消息正文
FormData url.Values FormData url.Values
} }
@@ -68,7 +68,7 @@ type PayOrderData struct {
type WaitOrderCallback struct { type WaitOrderCallback struct {
PublicOrderCallback PublicOrderCallback
Data *PayOrderData `json:"data"` Data *WaitOrderData `json:"data"`
} }
type WaitOrderData struct { type WaitOrderData struct {