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

wxpay

Browse Source
This commit is contained in:
苏尹岚
2020-11-03 18:26:51 +08:00
parent 62b7ee89d7
commit 8808a71f7c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,6 @@ import (
"git.rosy.net.cn/baseapi/platformapi/wxpayapi" "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/auth2/authprovider/weixin" "git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals"
@@ -46,7 +45,7 @@ func (p *PayHandler) CreatePay() (err error) {
case model.PayTypeWX: case model.PayTypeWX:
param := &wxpayapi.CreateOrderParam{ param := &wxpayapi.CreateOrderParam{
OutTradeNo: utils.Int64ToStr(p.Order.OrderID), OutTradeNo: utils.Int64ToStr(p.Order.OrderID),
Body: fmt.Sprintf("付款给冲天猴儿app:%f 元", jxutils.IntPrice2Standard(int64(p.Order.PayPrice))), Body: "冲天猴儿App账户充值",
NotifyURL: globals.WxpayNotifyURL, NotifyURL: globals.WxpayNotifyURL,
SpbillCreateIP: p.Ctx.GetRealRemoteIP(), SpbillCreateIP: p.Ctx.GetRealRemoteIP(),
TradeType: p.VendorPayType, TradeType: p.VendorPayType,

3
business/model/dao/dao_job.go
View File

@@ -279,12 +279,13 @@ type GetJobOrdersResult struct {
JobOrderFinishAt time.Time `json:"jobOrderFinishAt"` JobOrderFinishAt time.Time `json:"jobOrderFinishAt"`
JobIndexImg string `json:"jobIndexImg"` JobIndexImg string `json:"jobIndexImg"`
JobLimitAt int `json:"jobLimitAt"` JobLimitAt int `json:"jobLimitAt"`
VendorID int `orm:"column(vendor_id)" json:"vendorID"`
} }
func GetJobOrders(db *DaoDB, jobID int, jobOrderID int64, userID string, statusCompareStr string, fromTime, toTime time.Time, statuss []int, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) { func GetJobOrders(db *DaoDB, jobID int, jobOrderID int64, userID string, statusCompareStr string, fromTime, toTime time.Time, statuss []int, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) {
var jobOrders []*GetJobOrdersResult var jobOrders []*GetJobOrdersResult
sql := ` sql := `
SELECT SQL_CALC_FOUND_ROWS a.*, b.job_limit_at SELECT SQL_CALC_FOUND_ROWS a.*, b.job_limit_at, b.vendor_id
FROM job_order a FROM job_order a
JOIN job b ON a.job_id = b.id JOIN job b ON a.job_id = b.id
WHERE 1 = 1 WHERE 1 = 1