wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-lwl/wechat' into test

This commit is contained in:
lwl0608 2024-02-05 22:06:38 +08:00
parent 792783d923 2793229b6c
commit 3ed0c7bdeb
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/proto/vas/proto/pay.go
View File

@ -139,10 +139,11 @@ type H5DirectUnlockWechatReq struct {
} }
type H5DirectUnlockWechatData struct { type H5DirectUnlockWechatData struct {
CoinEnough int32 `json:"coin_enough"` // 0:不够(用下面的支付宝参数)，1:够 CoinEnough int32 `json:"coin_enough"` // 0:不够(用下面的支付宝参数)，1:够
OrderId string `json:"order_id"` // 订单id OrderId string `json:"order_id"` // 订单id
AlipayParamStr string `json:"alipay_param_str"` // 支付宝 app支付参数 AlipayParamStr string `json:"alipay_param_str"` // 支付宝 app支付参数
AlipayH5ParamStr string `json:"alipay_h5_param_str"` // 支付宝 h5支付参数 AlipayH5ParamStr string `json:"alipay_h5_param_str"` // 支付宝 h5支付参数
WxpayNativeParamStr string `json:"wxpay_native_param_str"` // 微信支付 native支付参数
} }
// 支付宝回调参数 // 支付宝回调参数

7
app/mix/service/logic/vas.go
View File

@ -1513,9 +1513,10 @@ func (v *Vas) H5DirectUnlockWechat(ctx *gin.Context, req *vasproto.H5DirectUnloc
return return
} }
data = &vasproto.H5DirectUnlockWechatData{ data = &vasproto.H5DirectUnlockWechatData{
OrderId: cData.OrderId, OrderId: cData.OrderId,
AlipayParamStr: cData.AlipayParamStr, AlipayParamStr: cData.AlipayParamStr,
AlipayH5ParamStr: cData.AlipayH5ParamStr, AlipayH5ParamStr: cData.AlipayH5ParamStr,
WxpayNativeParamStr: cData.WxpayNativeParamStr,
} }
return return
} }