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

aa

Browse Source
This commit is contained in:
suyl
2021-08-26 18:11:12 +08:00
parent 9846686dbe
commit e160982c49
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dao/sim_dao.go
View File

@@ -1,7 +1,6 @@
package dao package dao
import ( import (
"fmt"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-print/model" "git.rosy.net.cn/jx-print/model"
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
@@ -150,8 +149,6 @@ func GetChargeInfo(db *sqlx.DB, appID int, printNo string, iccID, beginDate, end
} }
sqlOhter += " LIMIT ? OFFSET ?" sqlOhter += " LIMIT ? OFFSET ?"
sqlParams = append(sqlParams, pageSize, offset) sqlParams = append(sqlParams, pageSize, offset)
fmt.Println(sql + sqlOhter)
fmt.Println(sqlParams)
if err = db.Select(&results, sql+sqlOhter, sqlParams...); err == nil { if err = db.Select(&results, sql+sqlOhter, sqlParams...); err == nil {
return &model.PagedInfo{ return &model.PagedInfo{
TotalCount: count, TotalCount: count,

7
services/order.go
View File

@@ -2,7 +2,6 @@ package services
import ( import (
"encoding/json" "encoding/json"
"fmt"
"git.rosy.net.cn/baseapi/platformapi/tonglianpayapi" "git.rosy.net.cn/baseapi/platformapi/tonglianpayapi"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-print/dao" "git.rosy.net.cn/jx-print/dao"
@@ -54,9 +53,9 @@ var (
Reqsn: order.OrderID, Reqsn: order.OrderID,
PayType: vendorPayType, PayType: vendorPayType,
} }
if vendorPayType != tonglianpayapi.PayTypeWxCode { //if vendorPayType != tonglianpayapi.PayTypeWxCode {
return fmt.Errorf("暂不支持的支付类型！vendorPayType :%s", vendorPayType) // return fmt.Errorf("暂不支持的支付类型！vendorPayType :%s", vendorPayType)
} //}
result, err := api.TLpayAPI.CreateUnitorderOrder(param) result, err := api.TLpayAPI.CreateUnitorderOrder(param)
if err == nil { if err == nil {
order.PrepayID = result.PayInfo order.PrepayID = result.PayInfo