Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/services into dev

controllers/book/book.go

@@ -53,7 +53,8 @@ func (c *BookController) GetBookList() {
 	page, _ := c.GetInt("page")
 	pagesize, _ := c.GetInt("pagesize")
 	name := c.GetString("name")
-	list, err := c.serv.GetBookList(bookType, name, barcode, caseIDs, page, pagesize)
+	showzero := c.GetString("showzero")
+	list, err := c.serv.GetBookList(bookType, name, barcode, showzero, caseIDs, page, pagesize)
 	if err != nil {
 		c.ResponseError(err)
 	}
@@ -130,6 +131,15 @@ func (c *BookController) ReturnBook() {
 	c.ResponseJSON("归还成功")
 }
 
+// ReserveBook 图书预约
+func (c *BookController) ReserveBook() {
+	bookid := c.GetString(":bookid")
+	record, err := c.serv.ReserveBook(bookid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(record)
+}
 func (c *BookController) GetCustomerReturnList() {
 	customerInfo := c.GetString(":customerInfo")
 	caseIDs := c.GetString("caseid")

models/book/book.go

@@ -1,6 +1,7 @@
 package book
 
 import (
+	"errors"
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
@@ -25,7 +26,7 @@ func NewBookDAO(ctx *utils.Context) *BookDAO {
 	}
 }
 
-func (m *BookDAO) GetBookList(bookType, name, barcode, caseid string, page, pageSize int) ([]model.TaBook, error) {
+func (m *BookDAO) GetBookList(bookType, name, barcode, showzero, caseid string, page, pageSize int) ([]model.TaBook, error) {
 	var book []model.TaBook
 	sql := `select * from ta_book where status = '` + strconv.Itoa(models.STATUS_NORMAL) + `'
 	and case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')`
@@ -38,12 +39,15 @@ func (m *BookDAO) GetBookList(bookType, name, barcode, caseid string, page, page
 	if barcode != "" {
 		sql += ` and barcode = '` + barcode + `'`
 	}
+	if showzero == "0" {
+		sql += ` and left_num>0`
+	}
 	sql += ` order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&book)
 	return book, err
 
 }
-func (m *BookDAO) GetBookListCount(bookType, name, barcode, caseid string) (int, error) {
+func (m *BookDAO) GetBookListCount(bookType, name, showzero, barcode, caseid string) (int, error) {
 	var book []model.TaBook
 	sql := `select * from ta_book where status = '` + strconv.Itoa(models.STATUS_NORMAL) + `'
 	and case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')`
@@ -56,6 +60,9 @@ func (m *BookDAO) GetBookListCount(bookType, name, barcode, caseid string) (int,
 	if name != "" {
 		sql += ` and (book_name like '%` + name + `%' or author like '%` + name + `%')`
 	}
+	if showzero == "0" {
+		sql += ` and left_num>0`
+	}
 	sql += ` order by create_date desc`
 	err := m.db.Sql(sql).Find(&book)
 	return len(book), err
@@ -154,7 +161,7 @@ func (m *BookDAO) GetBookRecommendList(caseid string, page, pageSize int) ([]mod
 	var book []model.TaBook
 	sql := `select * from ta_book where status = '` + strconv.Itoa(models.STATUS_NORMAL) + `'
 	and case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')
-	and is_recommend = '` + strconv.Itoa(models.RECOMMEND_YES) + `'`
+	and is_recommend = '` + strconv.Itoa(models.RECOMMEND_YES) + `' and left_num>0`
 	sql += ` order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&book)
 	return book, err
@@ -247,13 +254,27 @@ func (m *BookDAO) ReserveBook(record model.TaBookBorrowRecord) (model.TaBookBorr
 // 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)
+	err := m.db.Where("customer_id=?", customerid).And("book_id=?", bookid).And("borrow_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
 }
 
+// BookLeftNumDel 图书库存减少
+func (m *BookDAO) BookLeftNumDel(bookid string) error {
+	sql := `update ta_book set left_num = left_num - 1 where book_id=? and left_num > 0`
+	req, err := m.db.Exec(sql, bookid)
+	if err != nil {
+		return err
+	}
+	row, _ := req.RowsAffected()
+	if row == 0 {
+		return errors.New("预约失败，库存不足")
+	}
+	return nil
+}
+
 //
 func (m *BookDAO) CustomerReservedBook(bookId, customerId string) (*model.TaBookBorrowRecord, error) {
 	var book []model.TaBookBorrowRecord

routers/wechat.go

@@ -125,5 +125,6 @@ func getWechatRoutes(prefix string) beego.LinkNamespace {
 		beego.NSRouter("/booktype/:caseid", &booktype.BooktypeController{}, "get:GetList"),
 		beego.NSRouter("/book", &book.BookController{}, "get:GetBookList"),
 		beego.NSRouter("/customer/book", &book.BookController{}, "get:GetMineRecord"),
+		beego.NSRouter("/book/reserve/:bookid", &book.BookController{}, "post:ReserveBook"),
 	)
 }

service/book/book.go

@@ -45,16 +45,16 @@ func (s *BookServ) GetBookRecommendList(caseid string, page, pageSize int) (map[
 	}, nil
 }
 
-func (s *BookServ) GetBookList(bookType, name, barcode, caseid string, page, pageSize int) (map[string]interface{}, error) {
+func (s *BookServ) GetBookList(bookType, name, barcode, showzero, caseid string, page, pageSize int) (map[string]interface{}, error) {
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
-	list, err := s.dao.GetBookList(bookType, name, barcode, caseid, page, pageSize)
+	list, err := s.dao.GetBookList(bookType, name, barcode, showzero, caseid, page, pageSize)
 	if err != nil {
 		utils.LogError("获取图书列表失败: " + err.Error())
 		return nil, errors.New("获取图书列表失败")
 	}
-	total, err := s.dao.GetBookListCount(bookType, name, barcode, caseid)
+	total, err := s.dao.GetBookListCount(bookType, name, showzero, barcode, caseid)
 	if err != nil {
 		utils.LogError("获取图书列表失败: " + err.Error())
 		return nil, errors.New("获取图书列表失败")
@@ -290,3 +290,50 @@ func (s *BookServ) GetCustomerReturnList(customerInfo, caseId string, page, page
 		"page":     page,
 	}, nil
 }
+
+// ReserveBook 图书预约
+func (s *BookServ) ReserveBook(bookid string) (*model.TaBookBorrowRecord, error) {
+	book, err := s.dao.GetBookById(bookid)
+	if err != nil {
+		utils.LogError("获取图书信息失败：", err.Error())
+		return nil, errors.New("获取图书信息失败")
+	}
+	if book == nil || book.BookId == "" {
+		return nil, errors.New("没有对应的图书信息")
+	}
+	if book.LeftNum < 1 {
+		return nil, errors.New("预约失败，库存不足")
+	}
+	customer := s.ctx.Get("customer").(model.TaCustomer)
+	if customer.Phone == "" {
+		return nil, errors.New("请先绑定您的手机号，再进行预约！")
+	}
+	isok, err := s.dao.CheckUserReserveBook(customer.CustomerId, bookid)
+	if err != nil {
+		utils.LogError("判断用户是否已借阅此图书失败：", err.Error())
+		return nil, errors.New("判断失败，请刷新后重试！")
+	}
+	if !isok {
+		return nil, errors.New("您已预约或借阅此图书！")
+	}
+	var record = model.TaBookBorrowRecord{
+		BookId:        book.BookId,
+		CustomerId:    customer.CustomerId,
+		CustomerName:  customer.Name,
+		CustomerPhone: customer.Phone,
+		OrgId:         book.OrgId,
+		CaseId:        book.CaseId,
+	}
+	info, err := s.dao.ReserveBook(record)
+	if err != nil {
+		utils.LogError("预约失败：", err.Error())
+		return nil, errors.New("预约失败")
+	}
+	// 减库存
+	err = s.dao.BookLeftNumDel(book.BookId)
+	if err != nil {
+		utils.LogError("减库存失败：", err.Error())
+		return nil, err
+	}
+	return &info, err
+}