diff --git a/business/jxstore/cms/order.go b/business/jxstore/cms/order.go index 89c283322..79a52ef2e 100644 --- a/business/jxstore/cms/order.go +++ b/business/jxstore/cms/order.go @@ -39,7 +39,7 @@ func CreateOrder(ctx *jxcontext.Context, price, orderType int) (order *model.Ord return order, err } -func Pay(ctx *jxcontext.Context, orderID, payType int, vendorPayType string) (err error) { +func Pay(ctx *jxcontext.Context, orderID, payType int, vendorPayType string) (result *model.Order, err error) { var ( db = dao.GetDB() order = &model.Order{ @@ -59,7 +59,7 @@ func Pay(ctx *jxcontext.Context, orderID, payType int, vendorPayType string) (er err = financial.AddUserBill(db, jxutils.GenBillID(), order.UserID) } err = payHandler.CreatePay() - return err + return payHandler.Order, err } func Cash(ctx *jxcontext.Context, orderID, payType int, vendorPayType string) (errCode string, err error) { diff --git a/business/model/dao/dao_job.go b/business/model/dao/dao_job.go index 40743fdc3..159b656da 100644 --- a/business/model/dao/dao_job.go +++ b/business/model/dao/dao_job.go @@ -276,16 +276,15 @@ func GetJobOrdersNoPage(db *DaoDB, jobID int, jobOrderID int64, userID string, s type GetJobOrdersResult struct { model.JobOrder + model.Job 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, b.vendor_id + SELECT SQL_CALC_FOUND_ROWS a.*, b.* FROM job_order a JOIN job b ON a.job_id = b.id WHERE 1 = 1 @@ -332,7 +331,7 @@ func GetJobOrders(db *DaoDB, jobID int, jobOrderID int64, userID string, statusC if jobImgs, err := GetJobImgs(db, v.JobID); err == nil && len(jobImgs) > 0 { v.JobIndexImg = jobImgs[0].Img } - v.JobOrderFinishAt = v.CreatedAt.Add(time.Duration(v.JobLimitAt) * time.Hour) + v.JobOrderFinishAt = v.JobOrder.CreatedAt.Add(time.Duration(v.JobLimitAt) * time.Hour) } pagedInfo.Data = jobOrders } diff --git a/controllers/order_controller.go b/controllers/order_controller.go index 69bfe3c52..d47140bc3 100644 --- a/controllers/order_controller.go +++ b/controllers/order_controller.go @@ -20,7 +20,7 @@ type OrderController struct { // @router /Pay [post] func (c *OrderController) Pay() { c.callPay(func(params *tOrderPayParams) (retVal interface{}, errCode string, err error) { - err = cms.Pay(params.Ctx, params.OrderID, params.PayType, params.VendorPayType) + retVal, err = cms.Pay(params.Ctx, params.OrderID, params.PayType, params.VendorPayType) return retVal, "", err }) }