Merge branch 'dev-lwl/wechat' into test

2024-02-05 22:06:38 +08:00 · 2024-02-05 22:06:38 +08:00 · 3ed0c7bdeb
parent 792783d923 2793229b6c
commit 3ed0c7bdeb
2 changed files with 9 additions and 7 deletions
--- a/api/proto/vas/proto/pay.go
+++ b/api/proto/vas/proto/pay.go
@ -143,6 +143,7 @@ type H5DirectUnlockWechatData struct {
 	OrderId             string `json:"order_id"`               // 订单id
 	AlipayParamStr      string `json:"alipay_param_str"`       // 支付宝 app支付参数
 	AlipayH5ParamStr    string `json:"alipay_h5_param_str"`    // 支付宝 h5支付参数
+	WxpayNativeParamStr string `json:"wxpay_native_param_str"` // 微信支付 native支付参数
 }

 // 支付宝回调参数
--- a/app/mix/service/logic/vas.go
+++ b/app/mix/service/logic/vas.go
@ -1516,6 +1516,7 @@ func (v *Vas) H5DirectUnlockWechat(ctx *gin.Context, req *vasproto.H5DirectUnloc
 		OrderId:             cData.OrderId,
 		AlipayParamStr:      cData.AlipayParamStr,
 		AlipayH5ParamStr:    cData.AlipayH5ParamStr,
+		WxpayNativeParamStr: cData.WxpayNativeParamStr,
 	}
 	return
 }