From 3f914afbb6f3a1e08e5c43fab2df684b4c59eb70 Mon Sep 17 00:00:00 2001 From: gazebo Date: Sun, 12 May 2019 10:07:50 +0800 Subject: [PATCH] - mtwmapi.CallbackMsg.Data to FormData --- business/partner/purchase/mtwm/callback.go | 2 +- business/partner/purchase/mtwm/financial.go | 4 ++-- .../partner/purchase/mtwm/financial_test.go | 14 +++++------ business/partner/purchase/mtwm/order.go | 24 +++++++++---------- business/partner/purchase/mtwm/store.go | 4 ++-- business/partner/purchase/mtwm/waybill.go | 20 ++++++++-------- 6 files changed, 34 insertions(+), 34 deletions(-) diff --git a/business/partner/purchase/mtwm/callback.go b/business/partner/purchase/mtwm/callback.go index f0c5c6937..19e6f8021 100644 --- a/business/partner/purchase/mtwm/callback.go +++ b/business/partner/purchase/mtwm/callback.go @@ -30,5 +30,5 @@ func OnOrderCallbackMsg(msg *mtwmapi.CallbackMsg) (response *mtwmapi.CallbackRes } func GetOrderIDFromMsg(msg *mtwmapi.CallbackMsg) string { - return msg.Data.Get(mtwmapi.KeyOrderID) + return msg.FormData.Get(mtwmapi.KeyOrderID) } diff --git a/business/partner/purchase/mtwm/financial.go b/business/partner/purchase/mtwm/financial.go index a806b70ba..e4679fade 100644 --- a/business/partner/purchase/mtwm/financial.go +++ b/business/partner/purchase/mtwm/financial.go @@ -18,13 +18,13 @@ const ( // 存储美团退款订单结账信息 func OnFinancialMsg(msg *mtwmapi.CallbackMsg) (err error) { if msg.Cmd == mtwmapi.MsgTypeOrderPartialRefund { // 部分退款处理 - orderData := msg.Data + orderData := msg.FormData if orderData.Get("notify_type") == mtwmapi.NotifyTypeSuccess { err = partner.CurOrderManager.SaveAfsOrderFinancialInfo(curPurchaseHandler.AfsOrderDetail2Financial(orderData)) } } if msg.Cmd == mtwmapi.MsgTypeOrderRefund { // todo 全额退款处理 - orderData := msg.Data + orderData := msg.FormData if orderData.Get("notify_type") == mtwmapi.NotifyTypeSuccess { globals.SugarLogger.Debug(orderData.Get("order_id")) // 获得退款订单ID，去本地数据库拿？饿百消息推送只给了订单号，也没有通过订单号查询退款信息的接口 afsOrderID := orderData.Get("order_id") diff --git a/business/partner/purchase/mtwm/financial_test.go b/business/partner/purchase/mtwm/financial_test.go index ac96d99b0..fb0bacc67 100644 --- a/business/partner/purchase/mtwm/financial_test.go +++ b/business/partner/purchase/mtwm/financial_test.go @@ -13,13 +13,13 @@ import ( func TestOnFinancialMsg(t *testing.T) { msg := &mtwmapi.CallbackMsg{ - Cmd: "orderRefund", - Data: url.Values{}, + Cmd: "orderRefund", + FormData: url.Values{}, } - msg.Data.Set("timestamp", utils.Int64ToStr(time.Now().Unix())) - msg.Data.Set("order_id", "33762863167364867") - msg.Data.Set("notify_type", "agree") - msg.Data.Set("money", "23.56") + msg.FormData.Set("timestamp", utils.Int64ToStr(time.Now().Unix())) + msg.FormData.Set("order_id", "33762863167364867") + msg.FormData.Set("notify_type", "agree") + msg.FormData.Set("money", "23.56") food := []map[string]interface{}{ map[string]interface{}{ "app_food_code": "123", @@ -40,7 +40,7 @@ func TestOnFinancialMsg(t *testing.T) { "box_price": 1, }, } - msg.Data.Set("food", string(utils.MustMarshal(food))) + msg.FormData.Set("food", string(utils.MustMarshal(food))) res := curPurchaseHandler.onAfsOrderMsg(msg) fmt.Println(res) } diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go index a1ac61abb..ebeadcf03 100644 --- a/business/partner/purchase/mtwm/order.go +++ b/business/partner/purchase/mtwm/order.go @@ -207,21 +207,21 @@ func (c *PurchaseHandler) callbackMsg2Status(msg *mtwmapi.CallbackMsg) (orderSta orderID := GetOrderIDFromMsg(msg) vendorStatus := msg.Cmd remark := "" - statusTime := utils.Str2Int64(msg.Data.Get("timestamp")) + statusTime := utils.Str2Int64(msg.FormData.Get("timestamp")) switch msg.Cmd { case mtwmapi.MsgTypeUserUrgeOrder, mtwmapi.MsgTypeOrderModified, mtwmapi.MsgTypeOrderFinancial: vendorStatus = msg.Cmd case mtwmapi.MsgTypeOrderCanceled: vendorStatus = mtwmapi.OrderStatusCanceled - remark = msg.Data.Get("reason") + remark = msg.FormData.Get("reason") case mtwmapi.MsgTypeNewOrder, FakeMsgTypeOrderReceived, mtwmapi.MsgTypeOrderAccepted, FakeMsgTypeOrderDelivering, mtwmapi.MsgTypeOrderFinished: - vendorStatus = msg.Data.Get("status") - statusTime = utils.Str2Int64(msg.Data.Get("utime")) + vendorStatus = msg.FormData.Get("status") + statusTime = utils.Str2Int64(msg.FormData.Get("utime")) case mtwmapi.MsgTypeOrderRefund, mtwmapi.MsgTypeOrderPartialRefund: - notifyType := msg.Data.Get("notify_type") + notifyType := msg.FormData.Get("notify_type") vendorStatus = msg.Cmd + "-" + notifyType if true /*!c.isOrderFinished(utils.Str2Int64(orderID))*/ { // 已经提前判断了，到这里的都是售中 - remark = msg.Data.Get("reason") + remark = msg.FormData.Get("reason") if msg.Cmd == mtwmapi.MsgTypeOrderPartialRefund { if notifyType == mtwmapi.NotifyTypePartyApply { api.MtwmAPI.OrderRefundReject(utils.Str2Int64(orderID), "bu") // todo 京东与饿百都没有售前用户提出订单调整的，自动拒绝调整单 @@ -257,14 +257,14 @@ func (c *PurchaseHandler) callbackMsg2Status(msg *mtwmapi.CallbackMsg) (orderSta func (c *PurchaseHandler) postFakeMsg(vendorOrderID, cmd, vendorStatus string) { msg := &mtwmapi.CallbackMsg{ - Cmd: cmd, - Data: make(url.Values), + Cmd: cmd, + FormData: make(url.Values), } timeStr := utils.Int64ToStr(time.Now().Unix()) - msg.Data.Set(mtwmapi.KeyOrderID, vendorOrderID) - msg.Data.Set("status", vendorStatus) - msg.Data.Set("timestamp", timeStr) - msg.Data.Set("utime", timeStr) + msg.FormData.Set(mtwmapi.KeyOrderID, vendorOrderID) + msg.FormData.Set("status", vendorStatus) + msg.FormData.Set("timestamp", timeStr) + msg.FormData.Set("utime", timeStr) utils.CallFuncAsync(func() { OnOrderCallbackMsg(msg) }) diff --git a/business/partner/purchase/mtwm/store.go b/business/partner/purchase/mtwm/store.go index ffd74a17e..b7a5207cc 100644 --- a/business/partner/purchase/mtwm/store.go +++ b/business/partner/purchase/mtwm/store.go @@ -164,8 +164,8 @@ func (p *PurchaseHandler) RefreshAllStoresID(ctx *jxcontext.Context, parentTask func (p *PurchaseHandler) onStoreStatusChanged(msg *mtwmapi.CallbackMsg) (response *mtwmapi.CallbackResponse) { var err error - poiStatus := int(utils.Str2Int64(msg.Data.Get("poi_status"))) - vendorStoreID := msg.Data.Get("app_poi_code") + poiStatus := int(utils.Str2Int64(msg.FormData.Get("poi_status"))) + vendorStoreID := msg.FormData.Get("app_poi_code") storeStatus := 0 if poiStatus == mtwmapi.MsgPoiStatusOpened { storeStatus = model.StoreStatusOpened diff --git a/business/partner/purchase/mtwm/waybill.go b/business/partner/purchase/mtwm/waybill.go index 7a3c739ef..39fa708cd 100644 --- a/business/partner/purchase/mtwm/waybill.go +++ b/business/partner/purchase/mtwm/waybill.go @@ -34,13 +34,13 @@ func (c *PurchaseHandler) onWaybillMsg(msg *mtwmapi.CallbackMsg) (response *mtwm err := partner.CurOrderManager.OnWaybillStatusChanged(waybill) if err == nil && waybill.Status == model.WaybillStatusDelivering { msg := &mtwmapi.CallbackMsg{ - Cmd: FakeMsgTypeOrderDelivering, - Data: url.Values{}, + Cmd: FakeMsgTypeOrderDelivering, + FormData: url.Values{}, } - msg.Data.Set("timestamp", utils.Int64ToStr(time.Now().Unix())) - msg.Data.Set("utime", msg.Data.Get("timestamp")) - msg.Data.Set(mtwmapi.KeyOrderID, waybill.VendorOrderID) - msg.Data.Set("status", mtwmapi.OrderStatusDelivering) + msg.FormData.Set("timestamp", utils.Int64ToStr(time.Now().Unix())) + msg.FormData.Set("utime", msg.FormData.Get("timestamp")) + msg.FormData.Set(mtwmapi.KeyOrderID, waybill.VendorOrderID) + msg.FormData.Set("status", mtwmapi.OrderStatusDelivering) utils.CallFuncAsync(func() { OnOrderCallbackMsg(msg) }) @@ -50,17 +50,17 @@ func (c *PurchaseHandler) onWaybillMsg(msg *mtwmapi.CallbackMsg) (response *mtwm func (c *PurchaseHandler) callbackMsg2Waybill(msg *mtwmapi.CallbackMsg) (retVal *model.Waybill) { orderID := GetOrderIDFromMsg(msg) - vendorStatus := msg.Data.Get("logistics_status") + vendorStatus := msg.FormData.Get("logistics_status") retVal = &model.Waybill{ VendorOrderID: orderID, OrderVendorID: model.VendorIDMTWM, VendorWaybillID: orderID, WaybillVendorID: model.VendorIDMTWM, - CourierName: msg.Data.Get("dispatcher_name"), - CourierMobile: msg.Data.Get("dispatcher_mobile"), + CourierName: msg.FormData.Get("dispatcher_name"), + CourierMobile: msg.FormData.Get("dispatcher_mobile"), VendorStatus: vendorStatus, Status: c.GetWaybillStatusFromVendorStatus(vendorStatus), - StatusTime: getTimeFromTimestamp(utils.Str2Int64(msg.Data.Get("time"))), + StatusTime: getTimeFromTimestamp(utils.Str2Int64(msg.FormData.Get("time"))), Remark: "", } return retVal