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

Merge branch 'master' of http://git.hiwavo.com/Fohow/fohow_api

abiao преди 4 години
родител
ревизия
03a71370c3
променени са 1 файла, в които са добавени 8 реда и са изтрити 4 реда
  1. 8 4
      go/gopath/src/fohow.com/libs/wx_mp/pay.go

+ 8 - 4
go/gopath/src/fohow.com/libs/wx_mp/pay.go

@@ -145,10 +145,14 @@ func GetMechantInfo(mechantCode string) (ret MechantPayInfo) {
 		ret.MchKeyFile = beego.AppConfig.String("OuBiaoMchKeyFile")
 		ret.MchCertFile = beego.AppConfig.String("OuBiaoMchCertFile")
 	default:
-		ret.MchId = mchId
-		ret.ApiKey = apiKey
-		ret.MchKeyFile = beego.AppConfig.String("WxMchKeyFile")
-		ret.MchCertFile = beego.AppConfig.String("MchCertFile")
+		//ret.MchId = mchId
+		//ret.ApiKey = apiKey
+		//ret.MchKeyFile = beego.AppConfig.String("WxMchKeyFile")
+		//ret.MchCertFile = beego.AppConfig.String("MchCertFile")
+		ret.MchId = oubiaoMchId
+		ret.ApiKey = oubiaoApiKey
+		ret.MchKeyFile = beego.AppConfig.String("OuBiaoMchKeyFile")
+		ret.MchCertFile = beego.AppConfig.String("OuBiaoMchCertFile")
 	}
 	return ret