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

pay result

Browse Source
This commit is contained in:
苏尹岚
2020-11-06 15:23:01 +08:00
parent 03dc9b724c
commit d0d2d6c2df
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/jxstore/cms/order.go
View File

@@ -3,6 +3,8 @@ package cms
import ( import (
"fmt" "fmt"
"git.rosy.net.cn/baseapi/platformapi/wxpayapi"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxstore/financial" "git.rosy.net.cn/jx-callback/business/jxstore/financial"
@@ -42,7 +44,7 @@ func CreateOrder(ctx *jxcontext.Context, orderType, price int) (orderID string,
return order.OrderID, err return order.OrderID, err
} }
func Pay(ctx *jxcontext.Context, orderID string, payType int, vendorPayType string) (result *model.Order, err error) { func Pay(ctx *jxcontext.Context, orderID string, payType int, vendorPayType string) (result *wxpayapi.CreateOrderResult, err error) {
var ( var (
db = dao.GetDB() db = dao.GetDB()
order = &model.Order{ order = &model.Order{
@@ -65,7 +67,7 @@ func Pay(ctx *jxcontext.Context, orderID string, payType int, vendorPayType stri
err = financial.AddUserBill(db, jxutils.GenBillID(), order.UserID) err = financial.AddUserBill(db, jxutils.GenBillID(), order.UserID)
} }
err = payHandler.CreatePay() err = payHandler.CreatePay()
return payHandler.Order, err return payHandler.WxPayResult, err
} }
func Cash(ctx *jxcontext.Context, orderID string, payType int, vendorPayType string) (errCode string, err error) { func Cash(ctx *jxcontext.Context, orderID string, payType int, vendorPayType string) (errCode string, err error) {

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

@@ -58,6 +58,7 @@ func (p *PayHandler) CreatePay() (err error) {
} }
result, err := api.WxpayAPI.CreateUnifiedOrder(param) result, err := api.WxpayAPI.CreateUnifiedOrder(param)
if err == nil { if err == nil {
p.WxPayResult = result
p.Order.PrepayID = result.PrepayID p.Order.PrepayID = result.PrepayID
p.Order.Comment = result.CodeURL p.Order.Comment = result.CodeURL
_, err = dao.UpdateEntity(dao.GetDB(), p.Order, "PrepayID", "Comment") _, err = dao.UpdateEntity(dao.GetDB(), p.Order, "PrepayID", "Comment")

4
business/jxstore/financial/pay.go
View File

@@ -3,6 +3,8 @@ package financial
import ( import (
"fmt" "fmt"
"git.rosy.net.cn/baseapi/platformapi/wxpayapi"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals"
@@ -16,6 +18,8 @@ type PayHandler struct {
Ctx *jxcontext.Context Ctx *jxcontext.Context
Order *model.Order Order *model.Order
VendorPayType string VendorPayType string
WxPayResult *wxpayapi.CreateOrderResult `json:"wxPayResult"`
} }
type PayHandlerInterface interface { type PayHandlerInterface interface {