liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
苏尹岚
2020-11-24 15:36:52 +08:00
parent 34ea3761f3
commit d4ffefce8a
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
business/jxstore/financial/financial.go
View File

@@ -18,7 +18,6 @@ import (
"git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/globals/api"
"github.com/astaxie/beego"
) )
const ( const (
@@ -67,10 +66,6 @@ func (p *PayHandler) CreatePay() (err error) {
TimeStart: wxpayapi.Time2PayTime(time.Now()), TimeStart: wxpayapi.Time2PayTime(time.Now()),
// ProfitSharing: wxpayapi.OptYes, // ProfitSharing: wxpayapi.OptYes,
} }
if p.Order.Way == "weixinmini" {
param.SubMchID = beego.AppConfig.String("wxpayAppMchID")
// param.SubAppID = beego.AppConfig.String("wxpayAppID2")
}
authBinds, err := dao.GetUserBindAuthInfo(dao.GetDB(), p.Ctx.GetUserID(), model.AuthBindTypeAuth, []string{p.Order.Way}, "", "", "") authBinds, err := dao.GetUserBindAuthInfo(dao.GetDB(), p.Ctx.GetUserID(), model.AuthBindTypeAuth, []string{p.Order.Way}, "", "", "")
if err != nil { if err != nil {
return err return err

2
globals/api/api.go
View File

@@ -226,7 +226,7 @@ func Init() {
keyPEMBlock, _ := ioutil.ReadFile("conf/apiclient_key.pem") keyPEMBlock, _ := ioutil.ReadFile("conf/apiclient_key.pem")
WxpayAPI = wxpayapi.NewWithCertificate(beego.AppConfig.String("wxpayAppID1"), beego.AppConfig.String("wxpayAppKey"), beego.AppConfig.String("wxpayAppMchID"), WxpayAPI = wxpayapi.NewWithCertificate(beego.AppConfig.String("wxpayAppID1"), beego.AppConfig.String("wxpayAppKey"), beego.AppConfig.String("wxpayAppMchID"),
certPEMBlock, keyPEMBlock) certPEMBlock, keyPEMBlock)
WxpayAPI2 = wxpayapi.NewWithCertificate(beego.AppConfig.String("wxpayAppID3"), beego.AppConfig.String("wxpayAppKey"), beego.AppConfig.String("wxpayAppMchID2"), WxpayAPI2 = wxpayapi.NewWithCertificate(beego.AppConfig.String("wxpayAppID2"), beego.AppConfig.String("wxpayAppKey"), beego.AppConfig.String("wxpayAppMchID"),
certPEMBlock, keyPEMBlock) certPEMBlock, keyPEMBlock)
if globals.TLPayNotifyURL != "" { if globals.TLPayNotifyURL != "" {