1221

models/book/book.go

@@ -435,6 +435,7 @@ func (m *BookDAO) GetCustomerByCustomerInfo(customerInfo string) (*model.TaCusto
 type TimeList struct {
 	model.TaBookBorrowRecord `xorm:"extends"`
 	BookName                 string
+	CaseName                 string
 }
 
 // GetAllOneWeekRecord 获取时间还剩一周过期的借阅记录
@@ -442,10 +443,12 @@ func (m *BookDAO) GetAllOneWeekRecord() ([]TimeList, error) {
 	var record []TimeList
 	sql := `SELECT
 	a.*,
-	b.book_name
+	b.book_name,
+	c.case_name
 FROM
 	ta_book_borrow_record a 
 	inner join ta_book b on a.book_id = b.book_id
+	inner join sys_case c on a.case_id = c.case_id
 WHERE
 	DATE_FORMAT( a.end_date, "%Y-%m-%d" ) = DATE_FORMAT( ( SELECT date_add( now( ), INTERVAL 1 WEEK ) ), "%Y-%m-%d" )
 	and a.borrow_status = '` + models.BORROW_TYPE_BORROWED + `'`
@@ -458,10 +461,12 @@ func (m *BookDAO) GetAllLateRecord() ([]TimeList, error) {
 	var record []TimeList
 	sql := `SELECT
 	a.*,
-	b.book_name
+	b.book_name,
+	c.case_name
 FROM
 	ta_book_borrow_record a 
 	inner join ta_book b on a.book_id = b.book_id
+	inner join sys_case c on a.case_id = c.case_id
 WHERE
 	DATE_FORMAT( now(), "%Y-%m-%d" ) = DATE_FORMAT( ( SELECT date_add( a.end_date, INTERVAL 2 DAY ) ), "%Y-%m-%d" )
 	and a.borrow_status = '` + models.BORROW_TYPE_LATE + `'`
@@ -490,3 +495,12 @@ func (m *BookDAO) GetUserMappingById(customerId string) (*model.TaUserMapping, e
 	}
 	return &userMap[0], err
 }
+
+func (m *BookDAO) IsBarcodeExist(barcode, caseId string) (int, error) {
+	var book []model.TaBook
+	sql := `select * from ta_book where book_barcode = '` + barcode + `'
+	and case_id = '` + caseId + `' 
+	and status ='` + strconv.Itoa(models.STATUS_NORMAL) + `'`
+	err := m.db.Sql(sql).Find(&book)
+	return len(book), err
+}

models/booktype/booktype.go

@@ -85,3 +85,12 @@ func (m *BooktypeDAO) IsExistBook(bookTypeId string) (int, error) {
 	err := m.db.Sql(sql).Find(&book)
 	return len(book), err
 }
+
+func (m *BooktypeDAO) IsNameExist(bookTypeName, caseId string) (int, error) {
+	var book []model.TaBookType
+	sql := `select * from ta_book_type where book_type_name = '` + bookTypeName + `' 
+	and case_id = '` + caseId + `' 
+	and status ='` + strconv.Itoa(models.STATUS_NORMAL) + `'`
+	err := m.db.Sql(sql).Find(&book)
+	return len(book), err
+}

service/book/book.go

@@ -2,6 +2,7 @@ package book
 
 import (
 	"errors"
+	"fmt"
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/book"
 	"spaceofcheng/services/models/customer"
@@ -419,12 +420,13 @@ func (s *BookServ) SendMessageToCustomer() error {
 				To: utils.ClientID{ID: userMap.Openid},
 				Data: map[string]interface{}{
 					"orgid": weekList[i].OrgId,
-					"tplid": "",
+					"tplid": "6WoxRkdXrRyF0T7Kc4PU5CjkpzAPWKKsA6wBLAGSQQg",
 					"data": map[string]string{
-						"first":    "还书提醒",
+						"first":    "您好，您借阅图书即将逾期，请及时归还。",
 						"keyword1": weekList[i].BookName,
-						"keyword2": weekList[i].EndDate.Format("2006-01-02"),
-						// "remark":   fmt.Sprintf(remarkTpl, recored.ValidateEnd.Format("2006-01-02"), caseName),
+						"keyword2": weekList[i].BorrowDate.Format("2006-01-02"),
+						"keyword3": weekList[i].EndDate.Format("2006-01-02"),
+						"remark":   fmt.Sprintf("避免影响您下次借阅，请及时归还至", weekList[i].CaseName),
 					},
 				},
 			}
@@ -442,12 +444,13 @@ func (s *BookServ) SendMessageToCustomer() error {
 				To: utils.ClientID{ID: userMap.Openid},
 				Data: map[string]interface{}{
 					"orgid": lateList[i].OrgId,
-					"tplid": "",
+					"tplid": "ID:Be0a25NMb3fzLtNaaQn_YOuECQDnlCs1es5aVvfwRhs",
 					"data": map[string]string{
-						"first":    "逾期提醒",
+						"first":    "您好，您借阅图书的时间已经逾期2天",
 						"keyword1": lateList[i].BookName,
-						"keyword2": lateList[i].EndDate.Format("2006-01-02"),
-						// "remark":   fmt.Sprintf(remarkTpl, recored.ValidateEnd.Format("2006-01-02"), caseName),
+						"keyword2": weekList[i].BorrowDate.Format("2006-01-02"),
+						"keyword3": weekList[i].EndDate.Format("2006-01-02"),
+						"remark":   fmt.Sprintf("避免影响您下次借阅，请及时归还至", lateList[i].CaseName),
 					},
 				},
 			}

service/booktype/booktype.go

@@ -54,6 +54,14 @@ func (s *BooktypeServ) GetBookTypeById(bookTypeId string) (*model.TaBookType, er
 }
 
 func (s *BooktypeServ) SaveBookType(booktype model.TaBookType) (*model.TaBookType, error) {
+	num, err := s.dao.IsNameExist(booktype.BookTypeName, booktype.CaseId)
+	if err != nil {
+		utils.LogError("新增图书分类失败: " + err.Error())
+		return nil, errors.New("新增图书分类失败")
+	}
+	if num > 0 {
+		return nil, errors.New("已存在分类名称")
+	}
 	if booktype.BookTypeImg == "" {
 		return nil, errors.New("类型图片不能为空")
 	}