Merge remote-tracking branch 'origin/feature_413_cjh' into feature/rzy/api_1.0

This commit is contained in:
Rzy 2024-08-05 17:07:35 +08:00
commit 71ccc46f23
1 changed files with 2 additions and 2 deletions

View File

@ -21,6 +21,7 @@ import (
// WxCallback 微信支付回调
func WxCallback(c *gin.Context) {
logger.Info(c, "WxCallback-回调数据", c.Request)
payChannelId := c.Param("payChannelId")
logger.Info(c, "WxCallback-回调数据payChannelId", payChannelId)
if payChannelId == "" {
@ -49,7 +50,6 @@ func WxCallback(c *gin.Context) {
}
wxConfig.AppId = payChannelModel.AppId
logger.Info(c, "WxCallback-回调数据", c.Request)
notifyReq, err := wechat.V3ParseNotify(c.Request)
if err != nil {
logger.Error(c, "WxCallback-回调数据验签失败", err.Error())
@ -70,6 +70,7 @@ func WxCallback(c *gin.Context) {
// AliCallback 支付宝支付回调
func AliCallback(c *gin.Context) {
logger.Info(c, "AliCallback-回调数据", c.Request)
payChannelId := c.Param("payChannelId")
logger.Info(c, "AliCallback-回调数据APPID", payChannelId)
if payChannelId == "" {
@ -112,7 +113,6 @@ func AliCallback(c *gin.Context) {
aliConfig.AlipayPublicCert = []byte(aliConfigModel.AlipayPublicCert)
notifyReq, err := alipay.ParseNotifyToBodyMap(c.Request) // c.Request 是 gin 框架的写法
logger.Info(c, "AliCallback-回调数据", c.Request)
if err != nil {
xlog.Error(err)
return