update instock

controllers/book/book.go

@@ -4,6 +4,7 @@ import (
 	"spaceofcheng/services/controllers"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/book"
+	"strings"
 )
 
 // CaseController 信息
@@ -48,10 +49,11 @@ func (c *BookController) GetBookList() {
 		caseIDs = c.GetCaseIDs(cases)
 	}
 	bookType := c.GetString("bookType")
+	barcode := c.GetString("barcode")
 	page, _ := c.GetInt("page")
 	pagesize, _ := c.GetInt("pagesize")
 	name := c.GetString("name")
-	list, err := c.serv.GetBookList(bookType, name, caseIDs, page, pagesize)
+	list, err := c.serv.GetBookList(bookType, name, barcode, caseIDs, page, pagesize)
 	if err != nil {
 		c.ResponseError(err)
 	}
@@ -71,6 +73,19 @@ func (c *BookController) GetMineRecord() {
 	c.ResponseJSON(list)
 }
 
+func (c *BookController) GetInStockChangeByBookId() {
+	page, _ := c.GetInt("page")
+	pagesize, _ := c.GetInt("pagesize")
+	bookId := c.GetString(":bookId")
+	list, err := c.serv.GetInStockChangeByBookId(bookId, page, pagesize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(list)
+
+}
+
 // 新增库存盘点
 func (c *BookController) AddChangeRecord() {
 	change := model.TaInStockChange{}
@@ -79,6 +94,7 @@ func (c *BookController) AddChangeRecord() {
 	}
 	user := c.Context.Get("user").(model.SysUser)
 	change.ChangeUser = user.UserId
+	change.ChangeUserName = user.RealName
 	err := c.serv.AddChangeRecord(change)
 	if err != nil {
 		c.ResponseError(err)
@@ -86,3 +102,29 @@ func (c *BookController) AddChangeRecord() {
 
 	c.ResponseJSON("添加成功")
 }
+func (c *BookController) BorrowBook() {
+	bookIds := c.GetString(":bookIds")
+	customerId := c.GetString(":customerId")
+	cases := c.Context.Get("cases").([]model.SysUserCase)
+	caseIDs := c.GetCaseIDs(cases)
+	org := c.Context.Get("org").(model.SysOrg)
+	bookId := strings.Split(bookIds, ",")
+	for i := 0; i < len(bookId); i++ {
+		_, err := c.serv.BorrowBook(bookId[i], customerId, caseIDs, org.OrgId)
+		if err != nil {
+			c.ResponseError(err)
+		}
+	}
+	c.ResponseJSON("借阅成功")
+}
+func (c *BookController) ReturnBook() {
+	bookIds := c.GetString(":borrowIds")
+	bookId := strings.Split(bookIds, ",")
+	for i := 0; i < len(bookId); i++ {
+		err := c.serv.ReturnBook(bookId[i])
+		if err != nil {
+			c.ResponseError(err)
+		}
+	}
+	c.ResponseJSON("归还成功")
+}

models/book/book.go

@@ -25,7 +25,7 @@ func NewBookDAO(ctx *utils.Context) *BookDAO {
 	}
 }
 
-func (m *BookDAO) GetBookList(bookType, name, caseid string, page, pageSize int) ([]model.TaBook, error) {
+func (m *BookDAO) GetBookList(bookType, name, barcode, 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) + `')`
@@ -35,18 +35,24 @@ func (m *BookDAO) GetBookList(bookType, name, caseid string, page, pageSize int)
 	if name != "" {
 		sql += ` and (book_name like '%` + name + `%' or author like '%` + name + `%')`
 	}
+	if barcode != "" {
+		sql += ` and barcode = '` + barcode + `'`
+	}
 	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, caseid string) (int, error) {
+func (m *BookDAO) GetBookListCount(bookType, name, 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) + `')`
 	if bookType != "" {
 		sql += ` and book_type_id = '` + bookType + `'`
 	}
+	if barcode != "" {
+		sql += ` and barcode = '` + barcode + `'`
+	}
 	if name != "" {
 		sql += ` and (book_name like '%` + name + `%' or author like '%` + name + `%')`
 	}
@@ -88,10 +94,11 @@ func (m *BookDAO) EditBook(book model.TaBook) error {
 }
 func (m *BookDAO) AddBookRecord(record model.TaBookBorrowRecord) (*model.TaBookBorrowRecord, error) {
 	record.BookBorrowRecordId = utils.GetGUID()
+	record.CreateDate = time.Now()
 	_, err := m.db.Insert(record)
 	return &record, err
 }
-func (m *BookDAO) UpdateBookRecord(record model.TaBookBorrowRecord) error {
+func (m *BookDAO) UpdateBookRecord(record *model.TaBookBorrowRecord) (*model.TaBookBorrowRecord, error) {
 	var cols = []string{
 		"borrow_date",
 		"return_date",
@@ -99,12 +106,13 @@ func (m *BookDAO) UpdateBookRecord(record model.TaBookBorrowRecord) error {
 		"end_date",
 	}
 	_, err := m.db.Cols(cols...).Where("book_borrow_record_id = ?", record.BookBorrowRecordId).Update(record)
-	return err
+	return record, err
 }
 func (m *BookDAO) UpdateInStockBook(book *model.TaBook) error {
 	var cols = []string{
 		"in_stock",
 		"left_num",
+		"borrow_num",
 	}
 	_, err := m.db.Cols(cols...).Where("book_id = ?", book.BookId).Update(book)
 	return err
@@ -219,3 +227,85 @@ func (m *BookDAO) GetMineRecordCount(customerid string) (int, error) {
 	err := m.db.Where("customer_id=?", customerid).Find(&records)
 	return len(records), err
 }
+
+//
+func (m *BookDAO) CustomerReservedBook(bookId, customerId string) (*model.TaBookBorrowRecord, error) {
+	var book []model.TaBookBorrowRecord
+	sql := `SELECT
+	a.* 
+FROM
+	ta_book_borrow_record a
+WHERE
+	a.borrow_status = '` + models.BORROW_TYPE_RESERVE + `' 
+	AND a.customer_id = '` + customerId + `' 
+	AND a.book_id = '` + bookId + `'`
+	err := m.db.Sql(sql).Find(&book)
+	if len(book) <= 0 {
+		return nil, err
+	}
+	return &book[0], err
+}
+
+func (m *BookDAO) GetBorrowById(borrowId string) (*model.TaBookBorrowRecord, error) {
+	var book []model.TaBookBorrowRecord
+	sql := `SELECT
+	a.* 
+FROM
+	ta_book_borrow_record a
+WHERE
+	a.book_borrow_record_id = '` + borrowId + `'`
+	err := m.db.Sql(sql).Find(&book)
+	if len(book) <= 0 {
+		return nil, err
+	}
+	return &book[0], err
+}
+
+type ReturnList struct {
+	model.TaBookBorrowRecord `xorm:"extends"`
+	BookName                 string
+	BookBarcode              string
+	BookTypeName             string
+	LateDays                 string
+}
+
+func (m *BookDAO) GetCustomerReturnList(customerInfo, caseId string, page, pageSize int) ([]ReturnList, error) {
+	var record []ReturnList
+	sql := `SELECT
+	a.*,
+	b.book_name,
+	b.book_barcode,
+	c.book_type_name 
+FROM
+	ta_book_borrow_record a
+	INNER JOIN ta_book b ON a.book_id = b.book_id
+	INNER JOIN ta_book_type c ON b.book_type_id = c.book_type_id
+	INNER JOIN ta_customer d ON a.customer_id = d.customer_id 
+WHERE
+	a.borrow_status IN ( '` + models.BORROW_TYPE_BORROWED + `', '` + models.BORROW_TYPE_LATE + `' ) 
+	AND ( a.customer_phone = '` + customerInfo + `' OR d.barcode = '` + customerInfo + `' )
+	and a.case_id in('` + strings.Replace(caseId, ",", "','", -1) + `')`
+	sql += ` order by a.borrow_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	err := m.db.Sql(sql).Find(&record)
+	return record, err
+}
+
+func (m *BookDAO) GetCustomerReturnListCount(customerInfo, caseId string) (int, error) {
+	var record []ReturnList
+	sql := `SELECT
+	a.*,
+	b.book_name,
+	b.book_barcode,
+	c.book_type_name 
+FROM
+	ta_book_borrow_record a
+	INNER JOIN ta_book b ON a.book_id = b.book_id
+	INNER JOIN ta_book_type c ON b.book_type_id = c.book_type_id
+	INNER JOIN ta_customer d ON a.customer_id = d.customer_id 
+WHERE
+	a.borrow_status IN ( '` + models.BORROW_TYPE_BORROWED + `', '` + models.BORROW_TYPE_LATE + `' ) 
+	AND ( a.customer_phone = '` + customerInfo + `' OR d.barcode = '` + customerInfo + `' )
+	and a.case_id in('` + strings.Replace(caseId, ",", "','", -1) + `')`
+	err := m.db.Sql(sql).Find(&record)
+	return len(record), err
+}

models/model/ta_in_stock_change.go

@@ -5,13 +5,15 @@ import (
 )
 
 type TaInStockChange struct {
-	RecordId      string    `xorm:"not null pk VARCHAR(64)"`
-	BookId        string    `xorm:"VARCHAR(64)"`
-	InStockBefore int       `xorm:"INT(11)"`
-	InStockAfter  int       `xorm:"INT(11)"`
-	ChangeReason  string    `xorm:"TEXT"`
-	ChangeDate    time.Time `xorm:"DATETIME"`
-	ChangeUser    string    `xorm:"VARCHAR(64)"`
-	CaseId        string    `xorm:"VARCHAR(64)"`
-	OrgId         string    `xorm:"VARCHAR(64)"`
+	RecordId       string    `xorm:"not null pk VARCHAR(64)"`
+	BookId         string    `xorm:"VARCHAR(64)"`
+	InStockBefore  int       `xorm:"INT(11)"`
+	InStockAfter   int       `xorm:"INT(11)"`
+	InStockTotal   int       `xorm:"INT(11)"`
+	ChangeReason   string    `xorm:"TEXT"`
+	ChangeDate     time.Time `xorm:"DATETIME"`
+	ChangeUser     string    `xorm:"VARCHAR(64)"`
+	ChangeUserName string    `xorm:"VARCHAR(64)"`
+	CaseId         string    `xorm:"VARCHAR(64)"`
+	OrgId          string    `xorm:"VARCHAR(64)"`
 }

service/book/book.go

@@ -2,23 +2,28 @@ package book
 
 import (
 	"errors"
+	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/book"
+	"spaceofcheng/services/models/customer"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service"
 	"spaceofcheng/services/utils"
+	"time"
 )
 
 // BookServ 系统处理
 type BookServ struct {
-	ctx *utils.Context
-	dao *book.BookDAO
+	ctx  *utils.Context
+	dao  *book.BookDAO
+	cdao *customer.CustomerDAO
 }
 
 // NewBookServ 初始化
 func NewBookServ(ctx *utils.Context) *BookServ {
 	return &BookServ{
-		ctx: ctx,
-		dao: book.NewBookDAO(ctx),
+		ctx:  ctx,
+		dao:  book.NewBookDAO(ctx),
+		cdao: customer.NewCustomerDAO(ctx),
 	}
 }
 
@@ -40,16 +45,16 @@ func (s *BookServ) GetBookRecommendList(caseid string, page, pageSize int) (map[
 	}, nil
 }
 
-func (s *BookServ) GetBookList(bookType, name, caseid string, page, pageSize int) (map[string]interface{}, error) {
+func (s *BookServ) GetBookList(bookType, name, barcode, caseid string, page, pageSize int) (map[string]interface{}, error) {
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
-	list, err := s.dao.GetBookList(bookType, name, caseid, page, pageSize)
+	list, err := s.dao.GetBookList(bookType, name, barcode, caseid, page, pageSize)
 	if err != nil {
 		utils.LogError("获取图书列表失败: " + err.Error())
 		return nil, errors.New("获取图书列表失败")
 	}
-	total, err := s.dao.GetBookListCount(bookType, name, caseid)
+	total, err := s.dao.GetBookListCount(bookType, name, barcode, caseid)
 	if err != nil {
 		utils.LogError("获取图书列表失败: " + err.Error())
 		return nil, errors.New("获取图书列表失败")
@@ -143,6 +148,7 @@ func (s *BookServ) AddChangeRecord(change model.TaInStockChange) error {
 	bookAdd := change.InStockAfter - change.InStockBefore
 	book.InStock = book.InStock + bookAdd
 	book.LeftNum = change.InStockAfter
+	change.InStockTotal = book.InStock
 	err = s.dao.AddChangeRecord(change)
 	if err != nil {
 		utils.LogError("库存盘点失败: " + err.Error())
@@ -155,3 +161,117 @@ func (s *BookServ) AddChangeRecord(change model.TaInStockChange) error {
 	}
 	return nil
 }
+
+func (s *BookServ) BorrowBook(bookId, customerId, caseId, orgId string) (*model.TaBookBorrowRecord, error) {
+	reserveRecord, err := s.dao.CustomerReservedBook(bookId, customerId)
+	if err != nil {
+		utils.LogError("借阅失败: " + err.Error())
+		return nil, errors.New("借阅失败")
+	}
+	dd, _ := time.ParseDuration("168h")
+	book, err := s.dao.GetBookById(bookId)
+	if err != nil {
+		utils.LogError("借阅失败: " + err.Error())
+		return nil, errors.New("借阅失败")
+	}
+	if reserveRecord == nil {
+		customer, err := s.cdao.GetCustomerByID(customerId)
+		if err != nil {
+			utils.LogError("借阅失败: " + err.Error())
+			return nil, errors.New("借阅失败")
+		}
+		var borrowRecord = model.TaBookBorrowRecord{
+			BookId:        bookId,
+			BorrowStatus:  models.BORROW_TYPE_BORROWED,
+			CustomerId:    customerId,
+			CustomerName:  customer.Name,
+			CustomerPhone: customer.Phone,
+			BorrowDate:    time.Now(),
+			EndDate:       time.Now().Add(dd),
+			CaseId:        caseId,
+			OrgId:         orgId,
+		}
+		newBorrow, err := s.dao.AddBookRecord(borrowRecord)
+		if err != nil {
+			utils.LogError("借阅失败: " + err.Error())
+			return nil, errors.New("借阅失败")
+		}
+		book.BorrowNum = book.BorrowNum + 1
+		book.LeftNum = book.LeftNum - 1
+		err = s.dao.UpdateInStockBook(book)
+		if err != nil {
+			utils.LogError("借阅失败: " + err.Error())
+			return nil, errors.New("借阅失败")
+		}
+		return newBorrow, nil
+	}
+	reserveRecord.BorrowDate = time.Now()
+	reserveRecord.BorrowStatus = models.BORROW_TYPE_BORROWED
+	reserveRecord.EndDate = time.Now().Add(dd)
+	newBorrow, err := s.dao.UpdateBookRecord(reserveRecord)
+	if err != nil {
+		utils.LogError("借阅失败: " + err.Error())
+		return nil, errors.New("借阅失败")
+	}
+	book.BorrowNum = book.BorrowNum + 1
+	err = s.dao.UpdateInStockBook(book)
+	if err != nil {
+		utils.LogError("借阅失败: " + err.Error())
+		return nil, errors.New("借阅失败")
+	}
+	return newBorrow, nil
+
+}
+
+func (s *BookServ) ReturnBook(borrowId string) error {
+	record, err := s.dao.GetBorrowById(borrowId)
+	if err != nil {
+		utils.LogError("归还失败: " + err.Error())
+		return errors.New("归还失败")
+	}
+	book, err := s.dao.GetBookById(record.BookId)
+	if err != nil {
+		utils.LogError("归还失败: " + err.Error())
+		return errors.New("归还失败")
+	}
+	if record == nil {
+		return errors.New("不存在的借阅信息")
+	}
+	record.BorrowStatus = models.BORROW_TYPE_RETURN
+	record.ReturnDate = time.Now()
+	_, err = s.dao.UpdateBookRecord(record)
+	if err != nil {
+		utils.LogError("归还失败: " + err.Error())
+		return errors.New("归还失败")
+	}
+	book.BorrowNum = book.BorrowNum - 1
+	book.LeftNum = book.LeftNum + 1
+	err = s.dao.UpdateInStockBook(book)
+	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 {
+		pageSize = service.PAGENUM
+	}
+	list, err := s.dao.GetCustomerReturnList(customerInfo, caseId, page, pageSize)
+	if err != nil {
+		utils.LogError("获取库存盘点列表失败: " + err.Error())
+		return nil, errors.New("获取库存盘点列表失败")
+	}
+	total, err := s.dao.GetCustomerReturnListCount(customerInfo, caseId)
+	if err != nil {
+		utils.LogError("获取库存盘点列表失败: " + err.Error())
+		return nil, errors.New("获取库存盘点列表失败")
+	}
+	return map[string]interface{}{
+		"list":     list,
+		"pageSize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, nil
+}