delete booktype

controllers/book/book.go

@@ -261,3 +261,12 @@ func (c *BookController) GetRecordList() {
 	}
 	c.ResponseJSON(list)
 }
+
+func (c *BookController) CancelReserve() {
+	recordId := c.GetString(":recordId")
+	err := c.serv.CancelReserve(recordId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("取消成功")
+}

controllers/booktype/booktype.go

@@ -60,3 +60,13 @@ func (c *BooktypeController) SaveBookType() {
 	}
 	c.ResponseJSON(newbooktype)
 }
+
+func (c *BooktypeController) DeleteBookType() {
+	bookTypeId := c.GetString(":bookTypeId")
+	err := c.serv.DeleteBookType(bookTypeId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("删除成功")
+
+}

models/book/book.go

@@ -9,6 +9,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/astaxie/beego"
+
 	"github.com/go-xorm/xorm"
 )
 
@@ -105,6 +107,15 @@ func (m *BookDAO) AddBookRecord(record model.TaBookBorrowRecord) (*model.TaBookB
 	_, err := m.db.Insert(record)
 	return &record, err
 }
+func (m *BookDAO) GetRecordById(recordId string) (*model.TaBookBorrowRecord, error) {
+	var record []model.TaBookBorrowRecord
+	sql := `select * from ta_book_borrow_record where book_borrow_record_id = '` + recordId + `'`
+	err := m.db.Sql(sql).Find(&record)
+	if len(record) <= 0 {
+		return nil, err
+	}
+	return &record[0], err
+}
 func (m *BookDAO) UpdateBookRecord(record *model.TaBookBorrowRecord) (*model.TaBookBorrowRecord, error) {
 	var cols = []string{
 		"borrow_date",
@@ -124,6 +135,7 @@ type BorrowRecord struct {
 	model.TaBookBorrowRecord `xorm:"extends"`
 	BookBarcode              string
 	BookName                 string
+	BookImg                  string
 }
 
 func (m *BookDAO) GetRecordList(borrowStatus, caseid, customerName, customerPhone, bookName, barcode string, page, pageSize int) ([]BorrowRecord, error) {
@@ -131,7 +143,8 @@ func (m *BookDAO) GetRecordList(borrowStatus, caseid, customerName, customerPhon
 	sql := `SELECT
 	a.*,
 	b.book_name,
-	b.book_barcode
+	b.book_barcode,
+	b.book_img
 FROM
 	ta_book_borrow_record a
 	INNER JOIN ta_book b ON a.book_id = b.book_id
@@ -152,6 +165,7 @@ FROM
 		sql += ` and b.book_barcode = '` + barcode + `'`
 	}
 	sql += ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	beego.Error(sql)
 	err := m.db.Sql(sql).Find(&record)
 	return record, err
 
@@ -416,10 +430,31 @@ func (m *BookDAO) GetCustomerByCustomerInfo(customerInfo string) (*model.TaCusto
 	return &customer[0], err
 
 }
-func (m *BookDAO) GetAllRecord() ([]model.TaBookBorrowRecord, error) {
+
+// GetAllOneWeekRecord
+func (m *BookDAO) GetAllOneWeekRecord() ([]model.TaBookBorrowRecord, error) {
 	var record []model.TaBookBorrowRecord
-	sql := `select * from ta_book_borrow_record where 
-	a.borrow_status IN ( '` + models.BORROW_TYPE_BORROWED + `', '` + models.BORROW_TYPE_LATE + `' )`
+	sql := `SELECT
+	a.* 
+FROM
+	ta_book_borrow_record a 
+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 + `'`
+	err := m.db.Sql(sql).Find(&record)
+	return record, err
+}
+
+// GetAllLateRecord
+func (m *BookDAO) GetAllLateRecord() ([]model.TaBookBorrowRecord, error) {
+	var record []model.TaBookBorrowRecord
+	sql := `SELECT
+	a.* 
+FROM
+	ta_book_borrow_record a 
+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 + `'`
 	err := m.db.Sql(sql).Find(&record)
 	return record, err
 }

models/booktype/booktype.go

@@ -66,3 +66,22 @@ func (m *BooktypeDAO) EditBookType(booktype model.TaBookType) (*model.TaBookType
 	return &booktype, err
 
 }
+func (m *BooktypeDAO) DeleteBookType(bookTypeId string) error {
+	var booktype = model.TaBookType{
+		BookTypeId: bookTypeId,
+		Status:     models.STATUS_DEL,
+	}
+	var cols = []string{
+		"status",
+	}
+	_, err := m.db.Cols(cols...).Where("book_type_id = ?", booktype.BookTypeId).Update(booktype)
+	return err
+}
+
+func (m *BooktypeDAO) IsExistBook(bookTypeId string) (int, error) {
+	var book []model.TaBook
+	sql := `select * from ta_book where book_type_id = '` + bookTypeId + `' 
+	and status = '` + strconv.Itoa(models.STATUS_NORMAL) + `'`
+	err := m.db.Sql(sql).Find(&book)
+	return len(book), err
+}

routers/common.go

@@ -360,11 +360,13 @@ func getCommonRoutes(prefix string) beego.LinkNamespace {
 		beego.NSRouter("/book/return/:customerInfo", &book.BookController{}, "get:GetCustomerReturnList"),
 		beego.NSRouter("/book/customer/:customerInfo", &book.BookController{}, "put:GetCustomerByCustomerInfo"),
 		beego.NSRouter("/book/excel", &book.BookController{}, "post:ExcelInpuData"),
+		beego.NSRouter("/book/cancel/:recordId", &book.BookController{}, "put:CancelReserve"),
 
 		// booktype 图书类型管理
 		beego.NSRouter("/booktype", &booktype.BooktypeController{}, "get:GetList"),
 		beego.NSRouter("/booktype/:bookTypeId", &booktype.BooktypeController{}, "get:GetBookTypeById"),
 		beego.NSRouter("/booktype", &booktype.BooktypeController{}, "post:SaveBookType"),
 		beego.NSRouter("/booktype", &booktype.BooktypeController{}, "put:SaveBookType"),
+		beego.NSRouter("/booktype/:bookTypeId", &booktype.BooktypeController{}, "delete:DeleteBookType"),
 	)
 }

service/book/book.go

@@ -272,6 +272,21 @@ func (s *BookServ) ReturnBook(borrowId string) error {
 	}
 	return nil
 }
+func (s *BookServ) CancelReserve(recordId string) error {
+	record, err := s.dao.GetRecordById(recordId)
+	if err != nil {
+		utils.LogError("取消失败: " + err.Error())
+		return errors.New("取消失败")
+	}
+	record.BorrowStatus = models.BORROW_TYPE_CANCEL
+	_, err = s.dao.UpdateBookRecord(record)
+	if err != nil {
+		utils.LogError("取消失败: " + err.Error())
+		return errors.New("取消失败")
+	}
+	return nil
+
+}
 
 func (s *BookServ) GetCustomerReturnList(customerInfo, caseId string, page, pageSize int) (map[string]interface{}, error) {
 	if pageSize == 0 {

service/booktype/booktype.go

@@ -70,3 +70,20 @@ func (s *BooktypeServ) SaveBookType(booktype model.TaBookType) (*model.TaBookTyp
 
 	return bookType, nil
 }
+
+func (s *BooktypeServ) DeleteBookType(bookTypeId string) error {
+	num, err := s.dao.IsExistBook(bookTypeId)
+	if err != nil {
+		utils.LogError("删除图书失败: " + err.Error())
+		return errors.New("删除图书失败")
+	}
+	if num > 0 {
+		return errors.New("该类型下有图书，不能删除")
+	}
+	err = s.dao.DeleteBookType(bookTypeId)
+	if err != nil {
+		utils.LogError("删除图书失败: " + err.Error())
+		return errors.New("删除图书失败")
+	}
+	return nil
+}