From 0a9ec88d03a2dadbc7873f6b362f6a51a979553d Mon Sep 17 00:00:00 2001
From: patrick <patrick@lawipac.comm>
Date: Mon, 9 Mar 2020 13:03:10 +1100
Subject: [PATCH] using RPN struct instead url.Values

---
 checksum.go | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/checksum.go b/checksum.go
index f4512b8..db47eef 100644
--- a/checksum.go
+++ b/checksum.go
@@ -34,27 +34,28 @@ func isLeanworkFormValid(form url.Values) bool {
 	return r == sign
 }
 
-func md4RpnFormP2P(form url.Values) string {
-	return md5RpnForm(form, Config.Rpn.MD5P2P)
+func md4RpnFormP2P(r RpnReq) string {
+	return md5RpnForm(r, Config.Rpn.MD5P2P)
 }
 
-func md5RpnFormFAT(form url.Values) string {
-	return md5RpnForm(form, Config.Rpn.MD5FAT)
+func md5RpnFormFAT(r RpnReq) string {
+	return md5RpnForm(r, Config.Rpn.MD5FAT)
 }
 
-func md5RpnForm(form url.Values, md5key string) string {
+func md5RpnForm(r RpnReq, md5key string) string {
 	s := ""
-	if _, ok := form["version"]; ok {
-		s += "sign_type=" + form["sign_type"][0] + "|"
-		s += "mid=" + form["mid"][0] + "|"
-		s += "notify_url=" + form["notify_url"][0] + "|"
-		s += "order_id=" + form["order_id"][0] + "|"
-		s += "order_amount=" + form["order_amount"][0] + "|"
-		s += "order_time=" + form["order_time"][0] + "|"
-		s += "user_id=" + form["user_id"][0] + "|"
-		s += "user_name=" + form["user_name"][0] + "|"
-		s += "user_cardno=" + form["user_cardno"][0] + "|"
-		s += "key=" + md5key
-	}
+	s += "version=" + r.version + "|"
+	s += "sign_type=" + r.sign_type + "|"
+	s += "mid=" + r.mid + "|"
+	s += "notify_url=" + r.notify_url + "|"
+	s += "order_id=" + r.order_id + "|"
+	s += "order_amount=" + r.order_amount + "|"
+	s += "order_time=" + r.order_time + "|"
+	s += "user_id=" + r.user_id + "|"
+	s += "user_name=" + r.user_name + "|"
+	s += "user_cardno=" + r.user_cardno + "|"
+	s += "key=" + md5key
+	fmt.Println(s)
+	fmt.Println(md5str(s))
 	return md5str(s)
 }