From 8808a71f7cf706e7e4fe6b75a7856237195fc37f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Tue, 3 Nov 2020 18:26:51 +0800 Subject: [PATCH] wxpay --- business/jxstore/financial/financial.go | 3 +-- business/model/dao/dao_job.go | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/business/jxstore/financial/financial.go b/business/jxstore/financial/financial.go index 92f1bc5ad..239d520d2 100644 --- a/business/jxstore/financial/financial.go +++ b/business/jxstore/financial/financial.go @@ -10,7 +10,6 @@ import ( "git.rosy.net.cn/baseapi/platformapi/wxpayapi" "git.rosy.net.cn/baseapi/utils" "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/dao" "git.rosy.net.cn/jx-callback/globals" @@ -46,7 +45,7 @@ func (p *PayHandler) CreatePay() (err error) { case model.PayTypeWX: param := &wxpayapi.CreateOrderParam{ OutTradeNo: utils.Int64ToStr(p.Order.OrderID), - Body: fmt.Sprintf("付款给冲天猴儿app:%f 元", jxutils.IntPrice2Standard(int64(p.Order.PayPrice))), + Body: "冲天猴儿App账户充值", NotifyURL: globals.WxpayNotifyURL, SpbillCreateIP: p.Ctx.GetRealRemoteIP(), TradeType: p.VendorPayType, diff --git a/business/model/dao/dao_job.go b/business/model/dao/dao_job.go index d761a9065..e6fa3ef45 100644 --- a/business/model/dao/dao_job.go +++ b/business/model/dao/dao_job.go @@ -279,12 +279,13 @@ type GetJobOrdersResult struct { JobOrderFinishAt time.Time `json:"jobOrderFinishAt"` JobIndexImg string `json:"jobIndexImg"` 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) { var jobOrders []*GetJobOrdersResult 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 JOIN job b ON a.job_id = b.id WHERE 1 = 1