This commit is contained in:
邹宗楠
2022-07-26 17:37:13 +08:00
parent d038f31e87
commit f4f6bbd80b
13 changed files with 123 additions and 121 deletions

View File

@@ -1,7 +1,6 @@
package controllers
import (
"git.rosy.net.cn/jx-print/controllers/controller"
"git.rosy.net.cn/jx-print/model"
"git.rosy.net.cn/jx-print/services/print_server"
"github.com/gin-gonic/gin"
@@ -19,13 +18,13 @@ func CreateOrder(c *gin.Context) {
}{}
)
if err = c.ShouldBind(&param); err != nil {
controller.BuildErrJson(c, err)
BuildErrJson(c, err)
return
}
if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
if tokenInfo = CheckToken(c); tokenInfo == nil {
return
}
if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
retVal, err = print_server.CreateOrder(tokenInfo, param.OrderType, param.Origin, param.ThingID, param.TypeID)
return retVal, "", err
}) {
@@ -44,13 +43,13 @@ func Pay(c *gin.Context) {
}{}
)
if err = c.ShouldBind(&param); err != nil {
controller.BuildErrJson(c, err)
BuildErrJson(c, err)
return
}
if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
if tokenInfo = CheckToken(c); tokenInfo == nil {
return
}
if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
retVal, err = print_server.Pay(tokenInfo, param.OrderID, param.PayType, param.VendorPayType)
return retVal, "", err
}) {