diff --git a/platformapi/tonglianpayapi/callback.go b/platformapi/tonglianpayapi/callback.go index 3a436e9b..201eaf4e 100644 --- a/platformapi/tonglianpayapi/callback.go +++ b/platformapi/tonglianpayapi/callback.go @@ -1,9 +1,10 @@ package tonglianpayapi import ( - "encoding/json" "io/ioutil" "net/http" + + "git.rosy.net.cn/baseapi/utils" ) const ( @@ -43,9 +44,9 @@ type CallBackResult struct { func (a *API) GetCallbackMsg(request *http.Request) (call *CallBackResult, err error) { data, err := ioutil.ReadAll(request.Body) - json.Unmarshal(data, &call) if err != nil { return nil, err } + utils.UnmarshalUseNumber(data, &call) return call, err } diff --git a/platformapi/tonglianpayapi/tonglianpayapi.go b/platformapi/tonglianpayapi/tonglianpayapi.go index fd26c851..6a63061d 100644 --- a/platformapi/tonglianpayapi/tonglianpayapi.go +++ b/platformapi/tonglianpayapi/tonglianpayapi.go @@ -75,22 +75,24 @@ type PayRefundParam struct { Remark string `json:"remark"` RandomStr string `json:"randomStr"` Sign string `json:"sign"` + TrxID string `json:"trxID"` + OldTrxID string `json:"oldTrxID"` } type PayRefundResult struct { - RetCode string `json:"retcode"` - RetMsg string `json:"retmsg"` - CusID string `json:"cusid"` - AppID string `json:"appid"` - TrxID string `json:"trxid"` + RetCode string `json:"retCode"` + RetMsg string `json:"retMsg"` + CusID string `json:"cusID"` + AppID string `json:"appID"` + TrxID string `json:"trxID"` Reqsn string `json:"reqsn"` - TrxStatus string `json:"trxstatus"` - FinTime string `json:"fintime"` - ErrMsg string `json:"errmsg"` - RandomStr string `json:"randomstr"` + TrxStatus string `json:"trxStatus"` + FinTime string `json:"finTime"` + ErrMsg string `json:"errMsg"` + RandomStr string `json:"randomStr"` Sign string `json:"sign"` - Fee int `json:"fee"` - TrxCode string `json:"trxcode"` + Fee string `json:"fee"` + TrxCode string `json:"trxCode"` } func New(appID, appKey, cusID, subAppid string, config ...*platformapi.APIConfig) *API { @@ -183,8 +185,9 @@ func (a *API) PayRefund(param *PayRefundParam) (result *PayRefundResult, err err params := make(map[string]interface{}) params["trxamt"] = param.Trxamt params["reqsn"] = param.Reqsn - params["oldreqsn"] = param.OldReqsn + // params["oldreqsn"] = param.OldReqsn params["remark"] = param.Remark + params["oldtrxid"] = param.OldTrxID retVal, err := a.AccessAPI("unitorder/refund", params) if err == nil { utils.Map2StructByJson(retVal, &result, false)