From 235ccab4881f1ee996d2ccd1d90a246e2732eb22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Fri, 6 Nov 2020 16:16:59 +0800 Subject: [PATCH] pay result --- business/jxstore/cms/order.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/business/jxstore/cms/order.go b/business/jxstore/cms/order.go index 9bc700ff5..6435965a6 100644 --- a/business/jxstore/cms/order.go +++ b/business/jxstore/cms/order.go @@ -3,8 +3,6 @@ package cms import ( "fmt" - "git.rosy.net.cn/baseapi/platformapi/wxpayapi" - "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxstore/financial" @@ -44,7 +42,7 @@ func CreateOrder(ctx *jxcontext.Context, orderType, price int) (orderID string, return order.OrderID, err } -func Pay(ctx *jxcontext.Context, orderID string, payType int, vendorPayType string) (result *wxpayapi.CreateOrderResult, err error) { +func Pay(ctx *jxcontext.Context, orderID string, payType int, vendorPayType string) (result *financial.WxPayParam, err error) { var ( db = dao.GetDB() order = &model.Order{ @@ -67,7 +65,7 @@ func Pay(ctx *jxcontext.Context, orderID string, payType int, vendorPayType stri err = financial.AddUserBill(db, jxutils.GenBillID(), order.UserID) } err = payHandler.CreatePay() - return payHandler.WxPayResult, err + return payHandler.WxPayParam, err } func Cash(ctx *jxcontext.Context, orderID string, payType int, vendorPayType string) (errCode string, err error) {