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

修改打印模板

Browse Source
This commit is contained in:
邹宗楠
2022-07-26 17:24:41 +08:00
parent ecdb628231
commit d038f31e87
35 changed files with 2586 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
controllers/order_controller.go
View File

@@ -1,6 +1,7 @@
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"
@@ -18,13 +19,13 @@ func CreateOrder(c *gin.Context) {
}{}
)
if err = c.ShouldBind(&param); err != nil {
buildErrJson(c, err)
controller.BuildErrJson(c, err)
return
}
if tokenInfo = checkToken(c); tokenInfo == nil {
if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
return
}
if !callFunc(c, func() (retVal interface{}, errCode string, err error) {
if !controller.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
}) {
@@ -43,13 +44,13 @@ func Pay(c *gin.Context) {
}{}
)
if err = c.ShouldBind(&param); err != nil {
buildErrJson(c, err)
controller.BuildErrJson(c, err)
return
}
if tokenInfo = checkToken(c); tokenInfo == nil {
if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
return
}
if !callFunc(c, func() (retVal interface{}, errCode string, err error) {
if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
retVal, err = print_server.Pay(tokenInfo, param.OrderID, param.PayType, param.VendorPayType)
return retVal, "", err
}) {