1
This commit is contained in:
@@ -51,9 +51,6 @@ func (p *PayHandler) CreatePay(txDB orm.TxOrmer, subAppID string) (err error) {
|
||||
if p.VendorPayType == tonglianpayapi.PayTypeWxXcx {
|
||||
param.SubAppID = subAppID
|
||||
authInfo, err := p.Ctx.GetV2AuthInfo()
|
||||
globals.SugarLogger.Debug("===================GetAuthType", authInfo.GetAuthType())
|
||||
globals.SugarLogger.Debug("===================GetAuthTypeID", authInfo.GetAuthTypeID())
|
||||
globals.SugarLogger.Debug("===================GetAuthID", authInfo.GetAuthID())
|
||||
// 微信小程序支付
|
||||
if err == nil && authInfo.GetAuthType() == weixin.AuthTypeMini && authInfo.GetAuthTypeID() == subAppID {
|
||||
param.Acct = authInfo.GetAuthID()
|
||||
@@ -76,13 +73,7 @@ func (p *PayHandler) CreatePay(txDB orm.TxOrmer, subAppID string) (err error) {
|
||||
}
|
||||
err = api.TLpayAPI.CreateH5UnitorderOrder(param2)
|
||||
} else {
|
||||
globals.SugarLogger.Debug("===================param", param.Acct)
|
||||
globals.SugarLogger.Debug("===================param", param.NotifyUrl)
|
||||
globals.SugarLogger.Debug("===================param", param.AppID)
|
||||
globals.SugarLogger.Debug("===================param", param.SubAppID)
|
||||
|
||||
result, err := api.TLpayAPI.CreateUnitorderOrder(param)
|
||||
globals.SugarLogger.Debug("===================err", err)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -91,8 +82,6 @@ func (p *PayHandler) CreatePay(txDB orm.TxOrmer, subAppID string) (err error) {
|
||||
json.Unmarshal([]byte(result.PayInfo), &result2)
|
||||
p.Order.PrepayID = result2.Package[strings.LastIndex(result2.Package, "=")+1 : len(result2.Package)]
|
||||
p.Order.TransactionID = result.TrxID
|
||||
globals.SugarLogger.Debug("===================p.Order.PrepayID", p.Order.PrepayID)
|
||||
globals.SugarLogger.Debug("===================p.Order.TransactionID ", p.Order.TransactionID)
|
||||
|
||||
if _, err = dao.UpdateEntityTx(txDB, p.Order, "PrepayID", "TransactionID"); err != nil {
|
||||
return err
|
||||
@@ -102,7 +91,7 @@ func (p *PayHandler) CreatePay(txDB orm.TxOrmer, subAppID string) (err error) {
|
||||
Noncestr: result2.NonceStr,
|
||||
Timestamp: utils.Int64ToStr(utils.MustInterface2Int64(result2.TimeStamp)),
|
||||
Package: result2.Package,
|
||||
Partnerid: "",
|
||||
Partnerid: "", // 商户Id
|
||||
Appid: result2.AppID,
|
||||
Sign: result2.PaySign,
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user