修改核销参数说明

cancel.go

@@ -1,13 +1,8 @@
-package order
+package orderrpc
 
 import (
-	"crypto/md5"
-	"encoding/hex"
 	"encoding/json"
-	"errors"
-	"log"
 	"strconv"
-	"strings"
 	"time"
 
 	"git.tetele.net/tgo/crypter"
@@ -64,7 +59,7 @@ func Cancel(dbname, site_id string, order_id string, url ...string) (*OrderCance
 
 	var res_arr OrderCancelRes
 
-	err = json.Unmarshal([]byte(res_data_de), &res_arr)
+	err = json.Unmarshal([]byte(res_data), &res_arr)
 
 	if err != nil {
 		return nil, err

cancel_test.go

@@ -0,0 +1,13 @@
+package orderrpc
+
+import (
+	"testing"
+)
+
+func Test_Cancel(t *testing.T) {
+
+	ret, err := Cancel("jianfan", "100064", "2")
+
+	t.Log(ret)
+	t.Log(err)
+}

client.go

@@ -1,4 +1,4 @@
-package order
+package orderrpc
 
 import (
 	"crypto/md5"

client_test.go

@@ -1,4 +1,4 @@
-package order
+package orderrpc
 
 import (
 	"testing"

common.go

@@ -1,4 +1,12 @@
-package order
+package orderrpc
+
+import (
+	"errors"
+	"strconv"
+	"time"
+
+	"git.tetele.net/tgo/crypter"
+)
 
 const DES_KEY = "ordernew"
 
@@ -26,29 +34,65 @@ func HandleResponse(res *CreateResponse) (string, error) {
 
 	if res_data == "" {
 
-		return nil, errors.New("未收到收据")
+		return "", errors.New("未收到收据")
 	}
 
 	time_int64, err := strconv.ParseInt(res.GetTime(), 10, 64)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
 
 	now_int64 := time.Now().Unix()
 
 	if now_int64-time_int64 > 10 || time_int64-now_int64 > 10 {
 		//时间误差前后10秒，返回
-		return nil, errors.New("返回时间错误")
+		return "", errors.New("返回时间错误")
 	}
 
 	check_sign := CheckSign(res.GetSign(), res_data, res.GetTime())
 	if !check_sign {
-		return nil, errors.New("返回数据签名错误")
+		return "", errors.New("返回数据签名错误")
 	}
 
 	//解密
 	res_data_de := crypter.DesDe(res_data, "ordernew")
 
-	return res_data_de
+	return res_data_de, nil
+
+}
+
+/**
+ * 处理返回结果
+ */
+func GetOrgData(res *Response) (string, error) {
+
+	res_data := res.GetData()
+
+	if res_data == "" {
+
+		return "", errors.New("未收到收据")
+	}
+
+	time_int64, err := strconv.ParseInt(res.GetTime(), 10, 64)
+	if err != nil {
+		return "", err
+	}
+
+	now_int64 := time.Now().Unix()
+
+	if now_int64-time_int64 > 10 || time_int64-now_int64 > 10 {
+		//时间误差前后10秒，返回
+		return "", errors.New("返回时间错误")
+	}
+
+	check_sign := CheckSign(res.GetSign(), res_data, res.GetTime())
+	if !check_sign {
+		return "", errors.New("返回数据签名错误")
+	}
+
+	//解密
+	res_data_de := crypter.DesDe(res_data, DES_KEY)
+
+	return res_data_de, nil
 
 }

go.mod

@@ -0,0 +1,10 @@
+module git.tetele.net/tgo/orderrpc
+
+go 1.14
+
+require (
+	git.tetele.net/tgo/crypter v0.2.2
+	github.com/chai2010/protorpc v1.0.0
+	github.com/golang/protobuf v1.5.2
+	golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a // indirect
+)

go.sum

@@ -0,0 +1,23 @@
+git.tetele.net/tgo/crypter v0.2.2 h1:YMQJh2Gj5Po4ZfelJUmXBKi01UbmtiSy3bmqRfnYQMo=
+git.tetele.net/tgo/crypter v0.2.2/go.mod h1:vfvRLZA8+lHNgNXneOcgvVhDyuv25ZRb+C6xHOmXNx0=
+github.com/chai2010/protorpc v1.0.0 h1:aJ45G9sl1utSKo35EqnBSTs5jqTpdJDJAuZMMYPAtFo=
+github.com/chai2010/protorpc v1.0.0/go.mod h1:woR3WwjaQDqFjlzdVsFEKiK5Ur12QL8mYxVPjfr5z54=
+github.com/golang/protobuf v1.0.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/snappy v0.0.0-20170215233205-553a64147049 h1:K9KHZbXKpGydfDN0aZrsoHpLJlZsBrGMFWbgLDGnPZk=
+github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a h1:kr2P4QFmQr29mSLA43kwrOcgcReGTfbE9N577tCTuBc=
+golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=

order.pb.go

@@ -3,7 +3,7 @@
 // DO NOT EDIT!
 
 /*
-Package order is a generated protocol buffer package.
+Package orderrpc is a generated protocol buffer package.
 
 It is generated from these files:
 	order.proto
@@ -11,8 +11,10 @@ It is generated from these files:
 It has these top-level messages:
 	CreateRequest
 	CreateResponse
+	Request
+	Response
 */
-package order
+package orderrpc
 
 import proto "github.com/chai2010/protorpc/proto"
 import math "math"
@@ -94,6 +96,72 @@ func (m *CreateResponse) GetSign() string {
 	return ""
 }
 
+// 请求结构
+type Request struct {
+	Data             *string `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"`
+	Time             *string `protobuf:"bytes,2,opt,name=time" json:"time,omitempty"`
+	Sign             *string `protobuf:"bytes,3,opt,name=sign" json:"sign,omitempty"`
+	XXX_unrecognized []byte  `json:"-"`
+}
+
+func (m *Request) Reset()         { *m = Request{} }
+func (m *Request) String() string { return proto.CompactTextString(m) }
+func (*Request) ProtoMessage()    {}
+
+func (m *Request) GetData() string {
+	if m != nil && m.Data != nil {
+		return *m.Data
+	}
+	return ""
+}
+
+func (m *Request) GetTime() string {
+	if m != nil && m.Time != nil {
+		return *m.Time
+	}
+	return ""
+}
+
+func (m *Request) GetSign() string {
+	if m != nil && m.Sign != nil {
+		return *m.Sign
+	}
+	return ""
+}
+
+// 响应结构
+type Response struct {
+	Data             *string `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"`
+	Time             *string `protobuf:"bytes,2,opt,name=time" json:"time,omitempty"`
+	Sign             *string `protobuf:"bytes,3,opt,name=sign" json:"sign,omitempty"`
+	XXX_unrecognized []byte  `json:"-"`
+}
+
+func (m *Response) Reset()         { *m = Response{} }
+func (m *Response) String() string { return proto.CompactTextString(m) }
+func (*Response) ProtoMessage()    {}
+
+func (m *Response) GetData() string {
+	if m != nil && m.Data != nil {
+		return *m.Data
+	}
+	return ""
+}
+
+func (m *Response) GetTime() string {
+	if m != nil && m.Time != nil {
+		return *m.Time
+	}
+	return ""
+}
+
+func (m *Response) GetSign() string {
+	if m != nil && m.Sign != nil {
+		return *m.Sign
+	}
+	return ""
+}
+
 func init() {
 }
 
@@ -101,6 +169,8 @@ type OrderService interface {
 	Create(in *CreateRequest, out *CreateResponse) error
 	CreateByCart(in *CreateRequest, out *CreateResponse) error
 	Cancel(in *CreateRequest, out *CreateResponse) error
+	AutoReceive(in *Request, out *Response) error
+	VerifyByBooking(in *Request, out *Response) error
 }
 
 // AcceptOrderServiceClient accepts connections on the listener and serves requests
@@ -181,6 +251,12 @@ func (c *OrderServiceClient) CreateByCart(in *CreateRequest, out *CreateResponse
 func (c *OrderServiceClient) Cancel(in *CreateRequest, out *CreateResponse) error {
 	return c.Call("OrderService.Cancel", in, out)
 }
+func (c *OrderServiceClient) AutoReceive(in *Request, out *Response) error {
+	return c.Call("OrderService.AutoReceive", in, out)
+}
+func (c *OrderServiceClient) VerifyByBooking(in *Request, out *Response) error {
+	return c.Call("OrderService.VerifyByBooking", in, out)
+}
 
 // DialOrderService connects to an OrderService at the specified network address.
 func DialOrderService(network, addr string) (*OrderServiceClient, *rpc.Client, error) {

order.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package order;
+package orderrpc;
 
 // 下单请求结构
 message CreateRequest {
@@ -15,9 +15,26 @@ message CreateResponse {
     string sign = 3;
 }
 
+
+// 请求结构
+message Request {
+	string data = 1;
+	string time = 2;
+    string sign = 3;
+}
+
+// 响应结构
+message Response {
+    string data = 1; 
+    string time = 2;
+    string sign = 3;
+}
+
 // rpc方法
 service OrderService {
     rpc create (CreateRequest) returns (CreateResponse);    // 创建订单
     rpc createByCart (CreateRequest) returns (CreateResponse);    // 创建订单
     rpc cancel (CreateRequest) returns (CreateResponse);    // 取消订单
+    rpc autoReceive(Request) returns(Response); //自动收货
+    rpc VerifyByBooking(Request) returns(Response); //核销
 }

verify.go

@@ -0,0 +1,81 @@
+package orderrpc
+
+import (
+	"encoding/json"
+	"strconv"
+	"time"
+
+	"git.tetele.net/tgo/crypter"
+
+	"github.com/golang/protobuf/proto"
+)
+
+type OrderVerifyRes struct {
+	Result   bool
+	OrderRow map[string]string
+}
+
+/*
+ * 按核销码/用户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 res_arr, err
+	}
+	defer conn.Close()
+
+	data["dbname"] = dbname
+	data["site_id"] = site_id
+
+	data_json, err := json.Marshal(data)
+	if err != nil {
+		return res_arr, err
+	}
+
+	encryData := crypter.DesEn(string(data_json), DES_KEY)
+
+	now_int64 := time.Now().Unix()
+
+	now := strconv.FormatInt(now_int64, 10)
+
+	sign := Sign(encryData, now)
+
+	req := &Request{
+		proto.String(encryData),
+		proto.String(now),
+		proto.String(sign),
+		nil}
+
+	res := &Response{}
+
+	err = conn.VerifyByBooking(req, res)
+
+	if err != nil {
+		return res_arr, err
+	}
+
+	res_data_de, err := GetOrgData(res)
+
+	if err != nil {
+		return res_arr, err
+	}
+
+	err = json.Unmarshal([]byte(res_data_de), &res_arr)
+
+	if err != nil {
+		return res_arr, err
+	}
+
+	return res_arr, nil
+
+}