task tplId

models/book/book.go

@@ -164,9 +164,11 @@ FROM
 		sql += ` and b.book_barcode = '` + barcode + `'`
 	}
 	if borrowStatus != models.BORROW_TYPE_RESERVE {
-		sql += ` and a.borrow_status in(0,1,2,3)`
+		sql += ` and a.borrow_status in(0,1,2,3) order by a.borrow_date desc`
+	} else {
+		sql += `order by a.create_date desc `
 	}
-	sql += ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	sql += ` limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	beego.Error(sql)
 	err := m.db.Sql(sql).Find(&record)
 	return record, err

models/task.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/astaxie/beego"
+	"github.com/astaxie/beego/config"
 )
 
 func InitTask() {
@@ -23,6 +24,10 @@ func SendMessageToCustomer() time.Duration {
 		CaseName                 string
 		Openid                   string
 	}
+	appRoot := utils.GetAppRoot()
+	wechatconf, _ := config.NewConfig("ini", appRoot+"/conf/wechat.conf")
+	week := wechatconf.String("bookReturnAlertTplID")
+	late := wechatconf.String("bookLateAlertTplID")
 	var weekList []TimeRecordList
 	sql := `SELECT
 	a.*,
@@ -64,7 +69,7 @@ WHERE
 				To: utils.ClientID{ID: weekList[i].Openid},
 				Data: map[string]interface{}{
 					"orgid": weekList[i].OrgId,
-					"tplid": "6WoxRkdXrRyF0T7Kc4PU5CjkpzAPWKKsA6wBLAGSQQg",
+					"tplid": week,
 					"link":  "",
 					"data": map[string]string{
 						"first":    "您好，您借阅图书即将逾期，请及时归还。",
@@ -90,7 +95,7 @@ WHERE
 				To: utils.ClientID{ID: lateList[i].Openid},
 				Data: map[string]interface{}{
 					"orgid": lateList[i].OrgId,
-					"tplid": "ID:Be0a25NMb3fzLtNaaQn_YOuECQDnlCs1es5aVvfwRhs",
+					"tplid": late,
 					"link":  "",
 					"data": map[string]string{
 						"first":    "您好，您借阅图书的时间已经逾期2天",