1219

controllers/book/book.go

@@ -63,7 +63,8 @@ func (c *BookController) GetBookList() {
 func (c *BookController) GetMineRecord() {
 	page, _ := c.GetInt("page")
 	pagesize, _ := c.GetInt("pagesize")
-	list, err := c.serv.GetMineRecord(page, pagesize)
+	status := c.GetString("status")
+	list, err := c.serv.GetMineRecord(status, page, pagesize)
 	if err != nil {
 		c.ResponseError(err)
 	}

models/book/book.go

@@ -207,15 +207,48 @@ func (m *BookDAO) AddChangeRecord(change model.TaInStockChange) error {
 }
 
 // GetMineRecord 获取个人借阅记录
-func (m *BookDAO) GetMineRecord(customerid string, page, pagesize int) ([]model.TaBookBorrowRecord, error) {
+func (m *BookDAO) GetMineRecord(customerid, status string, page, pagesize int) ([]model.TaBookBorrowRecord, error) {
 	var records []model.TaBookBorrowRecord
-	err := m.db.Where("customer_id=?", customerid).Limit(pagesize, pagesize*(page-1)).Find(&records)
+	var db = m.db.Where("customer_id=?", customerid)
+	if status != "" {
+		db.And("borrow_status=?", status)
+	}
+	err := db.Limit(pagesize, pagesize*(page-1)).Find(&records)
 	return records, err
 }
 
 // GetMineRecordCount 获取个人借阅记录count
-func (m *BookDAO) GetMineRecordCount(customerid string) (int, error) {
+func (m *BookDAO) GetMineRecordCount(customerid, status string) (int, error) {
 	var records []model.TaBookBorrowRecord
-	err := m.db.Where("customer_id=?", customerid).Find(&records)
+	var db = m.db.Where("customer_id=?", customerid)
+	if status != "" {
+		db.And("borrow_status=?", status)
+	}
+	err := db.Find(&records)
 	return len(records), err
 }
+
+// ReserveBook 图书预约
+func (m *BookDAO) ReserveBook(record model.TaBookBorrowRecord) (model.TaBookBorrowRecord, error) {
+	record.BookBorrowRecordId = utils.GetGUID()
+	record.CreateDate = time.Now()
+	record.ReserveDate = time.Now()
+	dd, _ := time.ParseDuration("168h")
+	record.ReserveEndDate = time.Now().Add(dd)
+	record.BorrowStatus = models.BORROW_TYPE_RESERVE
+	_, err := m.db.Insert(record)
+
+	return record, err
+}
+
+// CheckUserReserveBook 判断用户书籍预约状态
+func (m *BookDAO) CheckUserReserveBook(customerid, bookid string) (bool, error) {
+	var records []model.TaBookBorrowRecord
+	err := m.db.Where("customer_id=?", customerid).And("book_id=?", bookid).And("status in ('" + models.BORROW_TYPE_RESERVE + "','" + models.BORROW_TYPE_BORROWED + "','" + models.BORROW_TYPE_LATE + "')").Find(&records)
+	if err != nil {
+		return false, err
+	}
+	return len(records) == 0, nil
+}
+
+//

models/constant.go

@@ -258,9 +258,9 @@ const (
 	BORROW_TYPE_RESERVE  = "reserve"
 	BORROW_TYPE_BORROWED = "borrowed"
 	BORROW_TYPE_RETURN   = "return"
-	BORROW_TYPE_EXPIRE   = "expire"
-	BORROW_TYPE_LATE     = "late"
-	BORROW_TYPE_CANCEL   = "cancel"
+	BORROW_TYPE_EXPIRE   = "expire" // 过期
+	BORROW_TYPE_LATE     = "late"   // 延期
+	BORROW_TYPE_CANCEL   = "cancel" // 取消
 )
 
 // 是否推荐

service/book/book.go

@@ -89,17 +89,17 @@ func (s *BookServ) EditBook(book model.TaBook) error {
 }
 
 // GetMineRecord 获取个人借阅记录
-func (s *BookServ) GetMineRecord(page, pageSize int) (map[string]interface{}, error) {
+func (s *BookServ) GetMineRecord(status string, page, pageSize int) (map[string]interface{}, error) {
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
 	customer := s.ctx.Get("customer").(model.TaCustomer)
-	list, err := s.dao.GetMineRecord(customer.CustomerId, page, pageSize)
+	list, err := s.dao.GetMineRecord(customer.CustomerId, status, page, pageSize)
 	if err != nil {
 		utils.LogError("获取图书列表失败: " + err.Error())
 		return nil, errors.New("获取图书列表失败")
 	}
-	total, err := s.dao.GetMineRecordCount(customer.CustomerId)
+	total, err := s.dao.GetMineRecordCount(customer.CustomerId, status)
 	if err != nil {
 		utils.LogError("获取图书列表失败: " + err.Error())
 		return nil, errors.New("获取图书列表失败")

service/sys.go

@@ -165,7 +165,7 @@ func (s *SysServ) authWechat(gctx *context.Context) map[string]interface{} {
 	var openID string
 
 	if beego.BConfig.RunMode == "dev" {
-		openID = "oMOpz0hVnuuxCwpViqMN6Vwx3Ewo11"
+		openID = "ouHcHt8oyP4jofR5cV2CZYXYgqkQ"
 	} else {
 		// 初始化微信配置
 		if err := s.initWechatClient(s.org.OrgId); err != nil {