From bd411ef72d3a92e0c2819276fb0a33132d0ab458 Mon Sep 17 00:00:00 2001 From: Rzy <465386466@qq.com> Date: Fri, 7 Jun 2024 16:11:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86rpc=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=AE=9A=E4=B9=89=E5=92=8C=E5=B7=A5=E5=85=B7=E5=91=BD?= =?UTF-8?q?=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/rpc/internal/logic/po/market/market.go | 14 ++-- .../internal/logic/po/market/types/sendKey.go | 30 ++++++++ cmd/rpc/internal/logic/zltxOrderCardLogic.go | 1 - cmd/rpc/pb/transfer.proto | 68 +++++++++---------- 4 files changed, 72 insertions(+), 41 deletions(-) create mode 100644 cmd/rpc/internal/logic/po/market/types/sendKey.go diff --git a/cmd/rpc/internal/logic/po/market/market.go b/cmd/rpc/internal/logic/po/market/market.go index 7d341ec..969e429 100644 --- a/cmd/rpc/internal/logic/po/market/market.go +++ b/cmd/rpc/internal/logic/po/market/market.go @@ -32,13 +32,15 @@ func (r *Market) SetData(data map[string]interface{}) *MarketRequest { //商户ID：test001 //AppId：test001 //平台Id：test001 - data["timestamp"] = time.Now().Unix() - privatekey := "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDEJHRzQjOTOtyR01BYq7ZsMlzBljTHqGl9FPsVfbn1kIeMQcbtbYsJhiIKS4exbxMXDRp211Mw89SXU4D/awpv0hPa+rMiwWxQEzLseI3EhTl4/vDBhg/EuViEaM60IuPQtW5cheFbABTw8T+HiysQTzUj11YcPUUMKVjDAHracnPuEwNxpZOLcuCK3Sltx/9GkQ2Lqk2J1UJ0kBg9dtPcY9WwoQXe+f1Ft/clmiFA5hXL4gulNiiCp2r3WetGCu18/Ql/jtp8d32PQF5xE+zTorboR9KGgoRwn7kw9Ylo0O2OACeAoX8Zc0eLqX+8oZGC66zw81TtloZGKSb8ThPNAgMBAAECggEACmQkBzcqpFIp/U/Eoe327CR+5YKfqTQy4n2KD8lpYKkXhUa20z1KcGa6xvDZb30C9eWr0T/3GFDSonG6E84H74ShqKg/dUfqBRP/TqfUWuTz9oULHDWOAE4RcnJbARAYIaZ7AkvVdIy8j0c4pmWpEmQf3JY76aMVVV+bZDlSSOBPnjLLodb1lgs+5YuQ5aZWtrWw3Bg5n8trpkuPjKxiYgKRmGoRVBAStrafkrOhS+xM/vP1yZLBpOa3Y99Vv5YCxE34caJc5hr6HU+YfpPfxaHZ9Z6Ct+uWuimZvPhSKSGIxVfryFKKlt0BP6PDM6f7fvPB20AM/SfDCn0m7Ye6AQKBgQDrjvQov08HLSrITKQ9I5CEODRUmkZWoGFmWBZjZ1Q7W/VZ6/Q8Wxlalwy7+7HrWMbRl0D4Vc+ghyur/bW+zSxLtFwQMc50LDd2lnz8Yvm4ZsE1dSkbOxmaWt18fBD69rKdY2GnZnb6X6oR60BqbLo7T7rvQ8U1sdAAoM6xCjFFKQKBgQDVKdrinOl3Wq5dydaH7HwsO3TwQh8ebmOt+btXB/u8AwQK4nzhP1mluJkSXZQnyHJegmujaxV7ntk3tLizCknQNknp/xfOrzocxn+18zyJ2B2zoIEysP2oxrFu80QtmfTh8fD/fpDwkR2NLG2XtuUKL7TPcg2pd5dRknarbOcqBQKBgQCgHyOfUzQgN7a+Q0LdgIBrMF16KQipOAodbMGDPqkGVKM6RedW48IfT1BLtHMj/MvhiwSSCprBj0DDgAn8MjHrICX4qDKjy67EANXjJlCD5e1uLj8MEKd9wkiOpzNPtUSDMhwek8tKtJ7B4X1/GnuZd8AlhpbWwhEXbDg0Ji6JyQKBgDNZ/e0Rt/yUz+SwNwpPoipVuHoYs751AXZr7wGsXqyQXWzx2vu4czRFIDsYaBSdaU/zQ1L+/RHm1pVg6A3ZsKaELZI9bdLQy8Ma3rFKg48BjUY0qGs50CHUm/IKkKYbrK6xxkkGiIwrqV7VESG3Yb3ueDRxWXE16jIwgn4Roi6xAoGAPJsEDVj0meHQZFrUjG36TLE7kT83LogwEvhTW9vcCoVkJuT5iT17D2DbgJCHe1Kpg874EbbCVNUTOuAxJanI1lVD+qEUUKAB9bTVTOHUtENjbiX7rrHAM8sf6v9Up4X0PwG+cYp/0LvNkre30DWlo52cBLC6iqJF9VR1+lK+Aiw=" - data["app_id"] = "test001" - data["mem_id"] = "test001" - data["pos_id"] = "test001" + data["timestamp"] = time.Now().Format("20060102150405") + private1 := "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC5FGH7Tq5u7pA/eh6AjAS0InykvWDJt095go8yK3w7+TRIhSYDdbRHlTgOQm4nWuMPfz3U2Rs1vJQwyyEYdylcYJ2zFLr7Vb1BdvkJ3Kz/2yJ6sz3BNq6xAHaeCKzA/WZxnc/ypfkGlrmfr2tNqCM9CUHUWryihBjLxwRiWLmo0aKgYpKLKYNixLgyqUYAifD3APncAduv6sSjUPMTyXMOlP1DXgVwX6IaUG/yV8/56Ew72Vdi/y4qZmCKMmXq4PovWrs8ISOEuhxbfLrGWbGCAVYPq7d7XaH+AOY4dhJZm7OZ43UGWw80QKGEPkvU4Oquzu8BqBh12md7Zsd6r0XzAgMBAAECggEAcLgTPKUc437z51UOwqeELdlbJFIaYn/8LTrwz1NgpH4P86L0FeNX2sjsjPK0d8+IvmV2WO2o/r9NWbI9A9N/Iz3MjcawYmZDj11QK0t1KZZil2wWzlfpaO+pTnJmFFvASq4ceeHPms2tW63QokkmvQOoTha9EBV3rJQW/XagDEolty57kkfmB31cQHJuAt+BF5EzBqv3q3jnqhsj8J/ddT0hadyKq65u85VomLH92asu/KKMKYYXC8aHjgX48chAmQUAHGM/HCD2owLHwtei2kPWNDx85ecBsglIX3wy0yhH1dnL+o3eeskVLl89ye3QCJPHJBaNUUfbgucgWT0bsQKBgQD1pPMAe31ZXajl9WlHMtn8qhpAGzi/GiiH6YrrHMQECC2GGuAakBko1Vhc+2HU35gwlPOhwMIOCapB0cCqcZVo3+71AKo78YvZLQ7yMuSsp0/Wn2N79NZ6+++wtHGPP9eHrLuWm23l15W7W0RcQptTaQupbculMQZ8b6cAjh6d1QKBgQDA4c4Xl2ePbQdgMMOuKTPPKF3QI1VhCVtxSV+Gj9MZBZedstz9+ZO3oxHhy8D5S9it1hE6dn6/a+7OWibZ/gBr1S0+11LcwKDb7q30dimr9bQs/srIywpoIIN8wVEkX4P9JLOWgQeAtq53IMba+cElef916aqyJpXuIek9lvUQpwKBgQCD7alNMwWpf3H8v4dhY+BLoRgkIfqiOGxYQogHqhVkjPfWNIzz9zxr/9lLZv+uEsBsJzOKRjpyy6ITY5H0eLhj8REnqMnFE/+mDlsenVLPn7Rzcns90ct3leOvpdnvs7wP9CdzxdqKPPUAAQ5/9o3xiFNpFbzv5Zq0LkslMy8iWQKBgQCiRJWctUxzllcRLpVBTPqAOkaKV195zmR2rzLFQvRmZZUDH7nZlQEYCgF+Q2tqj8uPm7tMwumo4wW55pAu7witr19sMbxNaWUrAeao9kvilkfpXsV9HYv4w/m6l+xKvGyPKDRJ1u1X9Nhb8mA5UsqSW8t2CIoJbHrQJwlRPlGXmwKBgQDg4rcsM2PmShOg8lSrHXPATXiZyyqpPJLpXbV6DRKyt7U6KWjyrplQN7yOoIUgsuD2OC/q67y7w1P3OY7X0RDnMr6MtIV0JyBJHg24eyBTqeLai2DqoHlsBOSvpJDZf+g/DXCjvHMWp1h0wqdj3aLthmU0dHM/CEqr/o7d8GwrGQ==" + //privatekey := "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApB7XD1M5tvwZQ81nyuH8aIfD+Q7cSzfBmeEkQ9+uoL9YbAXUc+uO1rFn1Lo2I6yeZcgjDcd67yq2kzf/zhLRUbZnM4VrnAMuo5dzMzLR+Ie6CRP0r5PT50vl7hUGeRhubv5AoqWpWeIVetTMgGKbrSh9ViJv8dSrmNceexqlU1hy0Y3AsEInucQoGVdFfHCKW+2rNIIawpoIbidCCMivUZDi7v3qkPQ4qB81e+5RRoMaq9SRPvMfXoEhOlaoMuZIL4T4UaMZBsPYJJlvwn/IZ/1WhS7H5vD6/fRxiPMHewUlNe1o8CMWdBFu8GGBAN2V/Hs52MmjFxq2GAoV4K1uXQIDAQAB" + p := "-----BEGIN RSA PRIVATE KEY-----\n" + private1 + "\n-----END RSA PRIVATE KEY-----" + data["app_id"] = "2783278" + data["mem_id"] = "2783278" + data["pos_id"] = "2783278" - sign, err := common.MarketMakeRsaSign(privatekey, data) + sign, err := common.MarketMakeRsaSign(p, data) if err != nil { panic(err) } diff --git a/cmd/rpc/internal/logic/po/market/types/sendKey.go b/cmd/rpc/internal/logic/po/market/types/sendKey.go new file mode 100644 index 0000000..8fa0f9e --- /dev/null +++ b/cmd/rpc/internal/logic/po/market/types/sendKey.go @@ -0,0 +1,30 @@ +package types + +type MarketSendRequest struct { + AppId string `json:"app_id"` //APP ID + Sign string `json:"sign"` //签名 + ReqCode string `json:"req_code"` //固定值：voucher.create + MemId string `json:"mem_id"` //商户号 + ReqSerialNo string `json:"req_serial_no"` //请求唯一流水号 最大32位 + TimeTamp string `json:"timestamp"` //时间戳 yyyyMMddHHmmss + PosId string `json:"pos_id"` //商户方平台号 + VoucherId string `json:"voucher_id"` //制码批次号 + VoucherNum int `json:"voucher_num"` //请券数量，默认是 1 + MobileNo string `json:"mobile_no"` //11 手机号，可传空字符串 + SendMsg string `json:"send_msg"` //是否发送短信：2- 发送 1-不发送 +} + +type MarketSenResponse struct { + VoucherId string `json:"voucher_id"` //制码批次号 + VoucherCode string `json:"voucher_code"` //券码 + ShortUrl string `json:"short_url"` //含二维码、条码的短链接 + VoucherSdate string `json:"voucher_sdate"` //有效期起 + VoucherEdate string `json:"voucher_edate"` //有效期止 + CodeType string `json:"code_type"` //码类型： 00- 代金券 01- 满减券 +} + +type MarketResponse struct { + ErrCode string `json:"errCode"` //00-成功 其他：失败 + Msg string `json:"msg"` //描 述 (失败时必填) + Data MarketSenResponse `json:"data"` +} diff --git a/cmd/rpc/internal/logic/zltxOrderCardLogic.go b/cmd/rpc/internal/logic/zltxOrderCardLogic.go index fbb48dc..243b329 100644 --- a/cmd/rpc/internal/logic/zltxOrderCardLogic.go +++ b/cmd/rpc/internal/logic/zltxOrderCardLogic.go @@ -25,7 +25,6 @@ func NewZltxOrderCardLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Zlt } func (l *ZltxOrderCardLogic) ZltxOrderCard(in *transfer.ZltxOrderCardReq) (*transfer.DefaultRes, error) { - res, err := l.svcCtx.ZltxOrder.SetData(common.StructToMap(in)).CardOrder() return &transfer.DefaultRes{ Code: res.Code, diff --git a/cmd/rpc/pb/transfer.proto b/cmd/rpc/pb/transfer.proto index ec2a46d..0820542 100755 --- a/cmd/rpc/pb/transfer.proto +++ b/cmd/rpc/pb/transfer.proto @@ -38,21 +38,21 @@ message MarketQueryRes { string msg=2; Data data=3; message Data{ - string voucherId = 1; - string voucherCode = 2; - string voucherStatus = 5; + string voucher_id = 1; + string voucher_code = 2; + string voucher_status = 5; } } message MarketQueryReq { - string appId = 1; + string app_id = 1; uint64 sign = 2; - string reqCode = 3; - string memId = 4; - string reqSerialNo = 5; + string req_code = 3; + string mem_id = 4; + string req_serial_no = 5; string timestamp = 6; - string voucherId = 8; - string voucherCode = 9; + string voucher_id = 8; + string voucher_code = 9; } @@ -61,22 +61,22 @@ message MarketKeyDiscardRes { string msg=2; Data data=3; message Data{ - string voucherId = 1; - string voucherCode = 2; - string voucherDate = 4; - string voucherStatus = 5; + string voucher_id = 1; + string voucher_code = 2; + string voucher_date = 4; + string status = 5; } } message MarketKeyDiscardReq { - string appId = 1; + string app_id = 1; uint64 sign = 2; - string reqCode = 3; - string memId = 4; - string reqSerialNo = 5; + string req_code = 3; + string mem_id = 4; + string req_serial_no = 5; string timestamp = 6; - string voucherId = 8; - string voucherCode = 9; + string voucher_id = 8; + string voucher_code = 9; } @@ -85,27 +85,27 @@ message MarketKeySendRes { string msg=2; Data data=3; message Data{ - string voucherId = 1; - string voucherCode = 2; - string shortUrl = 3; - string voucherSdate = 4; - string voucherEdate = 5; - string codeType = 6; + string voucher_id = 1; + string voucher_code = 2; + string short_url = 3; + string voucher_sdate = 4; + string voucher_edate = 5; + string code_type = 6; } } message MarketKeySendReq { - string appId = 1; + string app_id = 1; uint64 sign = 2; - string reqCode = 3; - string memId = 4; - string reqSerialNo = 5; + string req_code = 3; + string mem_id = 4; + string req_serial_no = 5; string timestamp = 6; - string posId = 7; - string voucherId = 8; - int64 voucherNum = 9; - string mobileNo = 10; - string sendMsg = 11; + string pos_id = 7; + string voucher_id = 8; + int64 voucher_num = 9; + string mobile_no = 10; + string send_msg = 11; }