- mtwmapi.CallbackMsg.Data to FormData

platformapi/mtwmapi/callback.go

@@ -40,8 +40,8 @@ type CallbackResponse struct {
 
 // !!!特别注意，Data中的数据
 type CallbackMsg struct {
-	Data url.Values
-	Cmd  string
+	FormData url.Values
+	Cmd      string
 }
 
 var (
@@ -77,16 +77,17 @@ func (a *API) GetCallbackMsg(request *http.Request) (msg *CallbackMsg, callbackR
 				msg = &CallbackMsg{
 					Cmd: cmd,
 				}
-				msg.Data = make(url.Values)
+				msg.FormData = make(url.Values)
 				for k, v := range data {
 					// 美团外卖的用户催单信息的timestamp是毫秒（其它的事件是秒），统一归一化为秒
 					if cmd == MsgTypeUserUrgeOrder && k == "timestamp" {
 						intV := utils.Str2Int64(v.(string))
 						if intV > time.Now().Unix()*2 {
 							v = utils.Int64ToStr(intV / 1000)
+							data[k] = v
 						}
 					}
-					msg.Data.Set(k, v.(string))
+					msg.FormData.Set(k, v.(string))
 				}
 			}
 		} else {
@@ -100,6 +101,6 @@ func (a *API) GetCallbackMsg(request *http.Request) (msg *CallbackMsg, callbackR
 }
 
 func (a *API) GetRefundSkuDetailFromMsg(msg *CallbackMsg) (refundSkuDetail []*RefundSkuDetail) {
-	utils.UnmarshalUseNumber([]byte(msg.Data.Get("food")), &refundSkuDetail)
+	utils.UnmarshalUseNumber([]byte(msg.FormData.Get("food")), &refundSkuDetail)
 	return refundSkuDetail
 }