|
|
@@ -2,37 +2,58 @@ package notify
|
|
|
|
|
|
import (
|
|
|
"fmt"
|
|
|
+ "reflect"
|
|
|
"sort"
|
|
|
+ "strings"
|
|
|
|
|
|
+ "github.com/fatih/structs"
|
|
|
"github.com/silenceper/wechat/v2/util"
|
|
|
+ "github.com/spf13/cast"
|
|
|
)
|
|
|
|
|
|
-// Base 公用参数
|
|
|
-type Base struct {
|
|
|
- AppID string `xml:"appid"`
|
|
|
- MchID string `xml:"mch_id"`
|
|
|
- NonceStr string `xml:"nonce_str"`
|
|
|
- Sign string `xml:"sign"`
|
|
|
-}
|
|
|
+// doc: https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_7&index=8
|
|
|
|
|
|
// PaidResult 下单回调
|
|
|
type PaidResult struct {
|
|
|
- Base
|
|
|
- ReturnCode string `xml:"return_code"`
|
|
|
- ReturnMsg string `xml:"return_msg"`
|
|
|
- ResultCode string `xml:"result_code"`
|
|
|
- OpenID string `xml:"openid"`
|
|
|
- IsSubscribe string `xml:"is_subscribe"`
|
|
|
- TradeType string `xml:"trade_type"`
|
|
|
- BankType string `xml:"bank_type"`
|
|
|
- TotalFee int `xml:"total_fee"`
|
|
|
- FeeType string `xml:"fee_type"`
|
|
|
- CashFee int `xml:"cash_fee"`
|
|
|
- CashFeeType string `xml:"cash_fee_type"`
|
|
|
- TransactionID string `xml:"transaction_id"`
|
|
|
- OutTradeNo string `xml:"out_trade_no"`
|
|
|
- Attach string `xml:"attach"`
|
|
|
- TimeEnd string `xml:"time_end"`
|
|
|
+ ReturnCode *string `xml:"return_code"`
|
|
|
+ ReturnMsg *string `xml:"return_msg"`
|
|
|
+
|
|
|
+ AppID *string `xml:"appid" json:"appid"`
|
|
|
+ MchID *string `xml:"mch_id"`
|
|
|
+ DeviceInfo *string `xml:"device_info"`
|
|
|
+ NonceStr *string `xml:"nonce_str"`
|
|
|
+ Sign *string `xml:"sign"`
|
|
|
+ SignType *string `xml:"sign_type"`
|
|
|
+ ResultCode *string `xml:"result_code"`
|
|
|
+ ErrCode *string `xml:"err_code"`
|
|
|
+ ErrCodeDes *string `xml:"err_code_des"`
|
|
|
+ OpenID *string `xml:"openid"`
|
|
|
+ IsSubscribe *string `xml:"is_subscribe"`
|
|
|
+ TradeType *string `xml:"trade_type"`
|
|
|
+ BankType *string `xml:"bank_type"`
|
|
|
+ TotalFee *int `xml:"total_fee"`
|
|
|
+ SettlementTotalFee *int `xml:"settlement_total_fee"`
|
|
|
+ FeeType *string `xml:"fee_type"`
|
|
|
+ CashFee *string `xml:"cash_fee"`
|
|
|
+ CashFeeType *string `xml:"cash_fee_type"`
|
|
|
+ CouponFee *int `xml:"coupon_fee"`
|
|
|
+ CouponCount *int `xml:"coupon_count"`
|
|
|
+
|
|
|
+ // coupon_type_$n 这里只声明 3 个，如果有更多的可以自己组合
|
|
|
+ CouponType0 *string `xml:"coupon_type_0"`
|
|
|
+ CouponType1 *string `xml:"coupon_type_1"`
|
|
|
+ CouponType2 *string `xml:"coupon_type_2"`
|
|
|
+ CouponID0 *string `xml:"coupon_id_0"`
|
|
|
+ CouponID1 *string `xml:"coupon_id_1"`
|
|
|
+ CouponID2 *string `xml:"coupon_id_2"`
|
|
|
+ CouponFeed0 *string `xml:"coupon_fee_0"`
|
|
|
+ CouponFeed1 *string `xml:"coupon_fee_1"`
|
|
|
+ CouponFeed2 *string `xml:"coupon_fee_2"`
|
|
|
+
|
|
|
+ TransactionID *string `xml:"transaction_id"`
|
|
|
+ OutTradeNo *string `xml:"out_trade_no"`
|
|
|
+ Attach *string `xml:"attach"`
|
|
|
+ TimeEnd *string `xml:"time_end"`
|
|
|
}
|
|
|
|
|
|
// PaidResp 消息通知返回
|
|
|
@@ -43,46 +64,38 @@ type PaidResp struct {
|
|
|
|
|
|
// PaidVerifySign 支付成功结果验签
|
|
|
func (notify *Notify) PaidVerifySign(notifyRes PaidResult) bool {
|
|
|
- // 封装map 请求过来的 map
|
|
|
- resMap := make(map[string]interface{})
|
|
|
- // base
|
|
|
- resMap["appid"] = notifyRes.AppID
|
|
|
- resMap["mch_id"] = notifyRes.MchID
|
|
|
- resMap["nonce_str"] = notifyRes.NonceStr
|
|
|
- // NotifyResult
|
|
|
- resMap["return_code"] = notifyRes.ReturnCode
|
|
|
- resMap["result_code"] = notifyRes.ResultCode
|
|
|
- resMap["openid"] = notifyRes.OpenID
|
|
|
- resMap["is_subscribe"] = notifyRes.IsSubscribe
|
|
|
- resMap["trade_type"] = notifyRes.TradeType
|
|
|
- resMap["bank_type"] = notifyRes.BankType
|
|
|
- resMap["total_fee"] = notifyRes.TotalFee
|
|
|
- resMap["fee_type"] = notifyRes.FeeType
|
|
|
- resMap["cash_fee"] = notifyRes.CashFee
|
|
|
- resMap["transaction_id"] = notifyRes.TransactionID
|
|
|
- resMap["out_trade_no"] = notifyRes.OutTradeNo
|
|
|
- resMap["attach"] = notifyRes.Attach
|
|
|
- resMap["time_end"] = notifyRes.TimeEnd
|
|
|
- // 支付key
|
|
|
+ // STEP1, 转换 struct 为 map，并对 map keys 做排序
|
|
|
+ resMap := structs.Map(notifyRes)
|
|
|
+
|
|
|
sortedKeys := make([]string, 0, len(resMap))
|
|
|
for k := range resMap {
|
|
|
sortedKeys = append(sortedKeys, k)
|
|
|
}
|
|
|
sort.Strings(sortedKeys)
|
|
|
- // STEP2, 对key=value的键值对用&连接起来，略过空值
|
|
|
+
|
|
|
+ // STEP2, 对key=value的键值对用&连接起来，略过空值 & sign
|
|
|
var signStrings string
|
|
|
for _, k := range sortedKeys {
|
|
|
- value := fmt.Sprintf("%v", resMap[k])
|
|
|
- if value != "" {
|
|
|
- signStrings = signStrings + k + "=" + value + "&"
|
|
|
+ value := fmt.Sprintf("%v", cast.ToString(resMap[k]))
|
|
|
+ if value != "" && strings.ToLower(k) != "sign" {
|
|
|
+ signStrings = signStrings + getTagKeyName(k, ¬ifyRes) + "=" + value + "&"
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
// STEP3, 在键值对的最后加上key=API_KEY
|
|
|
signStrings = signStrings + "key=" + notify.Key
|
|
|
+
|
|
|
// STEP4, 进行MD5签名并且将所有字符转为大写.
|
|
|
sign := util.MD5Sum(signStrings)
|
|
|
- if sign != notifyRes.Sign {
|
|
|
+ if sign != *notifyRes.Sign {
|
|
|
return false
|
|
|
}
|
|
|
return true
|
|
|
}
|
|
|
+
|
|
|
+func getTagKeyName(key string, notifyRes *PaidResult) string {
|
|
|
+ s := reflect.TypeOf(notifyRes).Elem()
|
|
|
+ f, _ := s.FieldByName(key)
|
|
|
+ name := f.Tag.Get("xml")
|
|
|
+ return name
|
|
|
+}
|
silenceper