Преглед на файлове

add Reverse: for v1.3.6

tags/v1.3.6
jiaoboxiang преди 2 години
родител
ревизия
dfb7090fb1
променени са 3 файла, в които са добавени 29 реда и са изтрити 11 реда
  1. +17
    -0
      md/join.go
  2. +11
    -10
      pay/pay_by_join.go
  3. +1
    -1
      test/join_pay_test.go

+ 17
- 0
md/join.go Целия файл

@@ -53,3 +53,20 @@ type JoinPayReq struct {
商户端终端设备 IP 地址。微信/支付宝被扫支付必填(即当q1_FrpCode= ALIPAY_CARD、WEIXIN_CARD);否"`
Hmac string `json:"hmac" label:"签名数据;参见签名机制;是"`
}

type JoinPayResponse struct {
R7TrxNo string `json:"r7_TrxNo"`
RbCodeMsg string `json:"rb_CodeMsg"`
R2OrderNo string `json:"r2_OrderNo"`
R3Amount string `json:"r3_Amount"`
R6FrpCode string `json:"r6_FrpCode"`
RcResult string `json:"rc_Result"`
RaCode int `json:"ra_Code"`
Hmac string `json:"hmac"`
RdPic string `json:"rd_Pic"`
R4Cur string `json:"r4_Cur"`
R5Mp string `json:"r5_Mp"`
R8MerchantBankCode string `json:"r8_MerchantBankCode"`
R0Version string `json:"r0_Version"`
R1MerchantNo string `json:"r1_MerchantNo"`
}

+ 11
- 10
pay/pay_by_join.go Целия файл

@@ -9,19 +9,20 @@ import (
"strings"
)

func UniPayByJoin(payParams *md.JoinPayReq, paySecretKey string,isPrd bool) (map[string]interface{}, error) {
func UniPayByJoin(payParams *md.JoinPayReq, paySecretKey string,isPrd bool) (*md.JoinPayResponse, error) {
payParams.P0Version = "2.1"
//payParams.P1MerchantNo = md.PayTestAccount
payParams.P1MerchantNo = md.PayTestAccount
payParams.P4Cur = "1"
//payParams.P2OrderNo = "9527"
//payParams.P3Amount = "10"
//payParams.P5ProductName = "测试商品"
//payParams.P9NotifyUrl = "AB|https://www.baidu.com"
payParams.P2OrderNo = "95271"
payParams.P3Amount = "0.1"
payParams.P5ProductName = "测试商品"
payParams.P9NotifyUrl = "AB|https://www.baidu.com"
//--交易类型//payParams.Q1FrpCode = md.Q1FrpCodeWEIXINPAYH5
//payParams.Q1FrpCode = md.Q1FrpCodeALIPAY
payParams.Q1FrpCode = md.Q1FrpCodeALIPAY
//原始微信AppId//payParams.Q7AppId = "gh_5a236de9850a"
//微信AppId//payParams.Q7AppId = "wx5bb10bb79cb5da1c"
//商家报备编号(分微信和支付宝的);支付宝的://payParams.QATradeMerchantNo = md.PayTestAliAccount
//商家报备编号(分微信和支付宝的);支付宝的:
payParams.QATradeMerchantNo = md.PayTestAliAccount
//商家报备编号(分微信和支付宝的);微信的://payParams.QATradeMerchantNo = md.PayTestWeChatAccount
postData := url.Values{}
creatHmac(payParams,paySecretKey, &postData)
@@ -34,9 +35,9 @@ func UniPayByJoin(payParams *md.JoinPayReq, paySecretKey string,isPrd bool) (map
}
defer response.Body.Close()
body, err := ioutil.ReadAll(response.Body)
resp := make(map[string]interface{})
resp := md.JoinPayResponse{}
zhios_pay_utils.Unserialize(body, &resp)
return resp, err
return &resp, err
}

func creatHmac(payParams *md.JoinPayReq,paySecretKey string, postData *url.Values) {


+ 1
- 1
test/join_pay_test.go Целия файл

@@ -7,5 +7,5 @@ import (
)

func TestUniPayByJoin(t *testing.T) {
pay.UniPayByJoin(&md.JoinPayReq{}, false)
pay.UniPayByJoin(&md.JoinPayReq{},"a12ceace4cc5423eae32b4626adf56c9" ,false)
}

Зареждане…
Отказ
Запис