From 5c825f44dfee85094ade70b2530893f5435c6f0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 21 Apr 2021 16:04:08 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/job.go    | 17 +++++++++++++++--
 business/model/dao/dao_bill.go |  6 +++++-
 controllers/job_controller.go  |  1 +
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go
index 3d1a9959f..c365ae1b2 100644
--- a/business/jxstore/cms/job.go
+++ b/business/jxstore/cms/job.go
@@ -236,7 +236,7 @@ func CancelPublishJob(ctx *jxcontext.Context, jobID int) (err error) {
 	if job.CashbackType == model.JobCashbackPrice {
 		price = job.SurplusCount * job.AvgPrice
 	} else {
-		if billIncomes, err := dao.GetBillIncome(db, jobID); err == nil {
+		if billIncomes, err := dao.GetBillIncome(db, jobID, 0); err == nil {
 			for _, v := range billIncomes {
 				price += v.IncomePrice
 			}
@@ -912,7 +912,7 @@ func RefreshJobStatus(ctx *jxcontext.Context) (err error) {
 			if job.CashbackType == model.JobCashbackPrice {
 				price = job.SurplusCount * job.AvgPrice
 			} else {
-				if billIncomes, err := dao.GetBillIncome(db, job.ID); err == nil {
+				if billIncomes, err := dao.GetBillIncome(db, job.ID, 0); err == nil {
 					for _, v := range billIncomes {
 						price += v.IncomePrice
 					}
@@ -2003,5 +2003,18 @@ func GetUnionJobOrderInfo(ctx *jxcontext.Context, jobOrderID int) (getUnionJobOr
 	if job.JobCategoryID != model.JobCategoryIDUnion {
 		return nil, fmt.Errorf("只允许联盟任务才能查看！")
 	}
+	userBill, err := dao.GetUserBill(db, jobOrder.UserID, "")
+	if err != nil {
+		return nil, err
+	}
+	incomes, err := dao.GetBillIncome(db, job.ID, userBill.BillID)
+	if err != nil {
+		return nil, err
+	}
+	incomeTotal := 0
+	for _, v := range incomes {
+		incomeTotal += v.IncomePrice
+	}
+	getUnionJobOrderInfoResult.IncomePrice = incomeTotal
 	return getUnionJobOrderInfoResult, err
 }
diff --git a/business/model/dao/dao_bill.go b/business/model/dao/dao_bill.go
index 49266700e..499d803b1 100644
--- a/business/model/dao/dao_bill.go
+++ b/business/model/dao/dao_bill.go
@@ -53,7 +53,7 @@ func GetBillExpend(db *DaoDB, userID string, billType int, fromTime, toTime time
 	return billExpends, err
 }
 
-func GetBillIncome(db *DaoDB, jobID int) (billIncomes []*model.BillIncome, err error) {
+func GetBillIncome(db *DaoDB, jobID int, billID int64) (billIncomes []*model.BillIncome, err error) {
 	sql := `
 		SELECT b.* 
 		  FROM user_bill a 
@@ -65,6 +65,10 @@ func GetBillIncome(db *DaoDB, jobID int) (billIncomes []*model.BillIncome, err e
 		sql += ` AND b.job_id = ?`
 		sqlParams = append(sqlParams, jobID)
 	}
+	if billID != 0 {
+		sql += ` AND b.bill_id = ?`
+		sqlParams = append(sqlParams, billID)
+	}
 	err = GetRows(db, &billIncomes, sql, sqlParams)
 	return billIncomes, err
 }
diff --git a/controllers/job_controller.go b/controllers/job_controller.go
index 9bc940666..58f74ce01 100644
--- a/controllers/job_controller.go
+++ b/controllers/job_controller.go
@@ -590,6 +590,7 @@ func (c *JobController) ShareUnionLink() {
 // @router /GetUnionJobOrderInfo [get]
 func (c *JobController) GetUnionJobOrderInfo() {
 	c.callGetUnionJobOrderInfo(func(params *tJobGetUnionJobOrderInfoParams) (retVal interface{}, errCode string, err error) {
+		retVal, err = cms.GetUnionJobOrderInfo(params.Ctx, params.JobOrderID)
 		return retVal, "", err
 	})
 }