Merge branch 'dev/dev1.0' into feature_413_cjh

app/http/controllers/front/payment_controller.go

@@ -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 == "" {
@@ -31,7 +32,11 @@ func WxCallback(c *gin.Context) {
 	var payChannelModel paychannelmodel.PayChannel
 	payChannelIdInt, _ := strconv.Atoi(payChannelId)
 	payChannelModel.Id = int64(payChannelIdInt)
-	services.PayChannelGet(&payChannelModel)
+	code := services.PayChannelGet(&payChannelModel)
+	if code == errorcode.PayChannelNotFound {
+		logger.Error(c, "AliCallback-回调数据未获取到支付配置，404")
+		c.String(http.StatusBadRequest, "%s", "fail")
+	}
 	if payChannelModel.ChannelType != common.PAY_CHANNEL_WECHAT_H5 {
 		logger.Error(c, "WxCallback-回调数据解析支付配置错误,查询的数据不是当前渠道")
 		c.String(http.StatusBadRequest, "%s", "fail")
@@ -49,7 +54,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 +74,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 == "" {
@@ -80,14 +85,14 @@ func AliCallback(c *gin.Context) {
 	payChannelIdInt, _ := strconv.Atoi(payChannelId)
 	payChannelModel.Id = int64(payChannelIdInt)
 	code := services.PayChannelGet(&payChannelModel)
-	if payChannelModel.ChannelType != common.PAY_CHANNEL_ALIPAY_WEB {
-		logger.Error(c, "AliCallback-回调数据解析支付配置错误,查询的数据不是当前渠道")
-		c.String(http.StatusBadRequest, "%s", "fail")
-	}
 	if code == errorcode.PayChannelNotFound {
 		logger.Error(c, "AliCallback-回调数据未获取到支付配置，404")
 		c.String(http.StatusBadRequest, "%s", "fail")
 	}
+	if payChannelModel.ChannelType != common.PAY_CHANNEL_ALIPAY_WEB {
+		logger.Error(c, "AliCallback-回调数据解析支付配置错误,查询的数据不是当前渠道")
+		c.String(http.StatusBadRequest, "%s", "fail")
+	}
 
 	var aliConfig paymentService.AliPay
 	var aliConfigModel struct {
@@ -112,7 +117,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