修改核销参数说明

verify.go

@@ -1,13 +1,8 @@
 package orderrpc
 
 import (
-	"crypto/md5"
-	"encoding/hex"
 	"encoding/json"
-	"errors"
-	"log"
 	"strconv"
-	"strings"
 	"time"
 
 	"git.tetele.net/tgo/crypter"
@@ -16,18 +11,26 @@ import (
 )
 
 type OrderVerifyRes struct {
-	Result bool
+	Result   bool
+	OrderRow map[string]string
 }
 
-func VerifyByBooking(dbname, site_id string, data map[string]string, url ...string) (*OrderVerifyRes, error) {
+/*
+ * 按核销码/用户ID核销订单
+ * data map[string]string{"verify_code":"","user_id":"","supplier_id":""}, verify_code/user_id 二选一
+ */
+func VerifyByBooking(dbname, site_id string, data map[string]string, url ...string) (OrderVerifyRes, error) {
 
 	var order_rpc_url string = "127.0.0.1:7973"
 	if len(url) > 0 && url[0] != "" {
 		order_rpc_url = url[0]
 	}
+
+	var res_arr OrderVerifyRes
+
 	conn, _, err := DialOrderService("tcp", order_rpc_url)
 	if err != nil {
-		return nil, err
+		return res_arr, err
 	}
 	defer conn.Close()
 
@@ -36,7 +39,7 @@ func VerifyByBooking(dbname, site_id string, data map[string]string, url ...stri
 
 	data_json, err := json.Marshal(data)
 	if err != nil {
-		return nil, err
+		return res_arr, err
 	}
 
 	encryData := crypter.DesEn(string(data_json), DES_KEY)
@@ -58,19 +61,21 @@ func VerifyByBooking(dbname, site_id string, data map[string]string, url ...stri
 	err = conn.VerifyByBooking(req, res)
 
 	if err != nil {
-		return nil, err
+		return res_arr, err
 	}
 
-	res_data_de := GetOrgData(res)
+	res_data_de, err := GetOrgData(res)
 
-	var res_arr OrderVerifyRes
+	if err != nil {
+		return res_arr, err
+	}
 
 	err = json.Unmarshal([]byte(res_data_de), &res_arr)
 
 	if err != nil {
-		return nil, err
+		return res_arr, err
 	}
 
-	return &res_arr, nil
+	return res_arr, nil
 
 }