spe

business/model/dao/dao_job.go

@@ -298,11 +298,19 @@ func GetJobOrdersNoPage(db *DaoDB, jobID int, jobOrderID int64, userID string, s
 	return jobOrders, err
 }
 
+type GetJobOrdersResult struct {
+	model.JobOrder
+	JobOrderFinishAt time.Time `json:"jobOrderFinishAt"`
+	JobIndexImg      string    `json:"jobIndexImg"`
+	JobLimitAt       int       `json:"jobLimitAt"`
+}
+
 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 []*model.JobOrder
+	var jobOrders []*GetJobOrdersResult
 	sql := `
-		SELECT SQL_CALC_FOUND_ROWS a.*
+		SELECT SQL_CALC_FOUND_ROWS a.*, b.job_limit_at
 		  FROM job_order a
+		  JOIN job b ON a.job_id = b.id 
 		 WHERE 1 = 1 
 	`
 	sqlParams := []interface{}{}
@@ -341,8 +349,21 @@ func GetJobOrders(db *DaoDB, jobID int, jobOrderID int64, userID string, statusC
 	if err = GetRows(db, &jobOrders, sql, sqlParams...); err == nil {
 		pagedInfo = &model.PagedInfo{
 			TotalCount: GetLastTotalRowCount(db),
-			Data:       jobOrders,
+			// Data:       jobOrders,
 		}
+		for _, v := range jobOrders {
+			v.JobOrderFinishAt = v.CreatedAt.Add(time.Duration(v.JobLimitAt) * time.Hour)
+			var jobImgs []*model.JobImg
+			sql3 := `
+			SELECT *
+			  FROM job_img
+			 WHERE job_id = ?
+		`
+			sqlParams3 := []interface{}{v.JobID}
+			err = GetRows(db, &jobImgs, sql3, sqlParams3)
+			v.JobIndexImg = jobImgs[0].Img
+		}
+		pagedInfo.Data = jobOrders
 	}
 	return pagedInfo, err
 }

conf/app.conf

@@ -62,9 +62,9 @@ weixinPageSecret = "c7a84ed3ef3ae04ac78e02fb593ffbe5"
 weixinMiniAppID  = "wx08a5c2a8581414ff"
 weixinMiniSecret = "e7ec67c86cbd4dfa531af7af7533cdc9"
 
-wxpayAppID = "wx4b5930c13f8b1170"
+wxpayAppID = "wx70d0943e61e0d15c"
 wxpayAppKey = "XKJPOIHJ233adf01KJIXlIeQDSDKFJAD"
-wxpayAppMchID = "1390686702"
+wxpayAppMchID = "1603491062"
 wxpayNotifyURL = "http://callback.rsm.jxc4.com/wxpay/msg/"
 
 tonglianPayAppID = "00183083"