book endDate

service/book/book.go

@@ -8,6 +8,7 @@ import (
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service"
 	"spaceofcheng/services/utils"
+	"strconv"
 	"time"
 )
 
@@ -32,6 +33,9 @@ func (s *BookServ) GetBookRecommendList(caseid string, page, pageSize int) (map[
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
+	if page == 0 {
+		page = 1
+	}
 	list, err := s.dao.GetBookRecommendList(caseid, page, pageSize)
 	if err != nil {
 		utils.LogError("获取图书列表失败: " + err.Error())
@@ -49,6 +53,9 @@ func (s *BookServ) GetBookList(bookType, name, barcode, showzero, caseid string,
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
+	if page == 0 {
+		page = 1
+	}
 	list, err := s.dao.GetBookList(bookType, name, barcode, showzero, caseid, page, pageSize)
 	if err != nil {
 		utils.LogError("获取图书列表失败: " + err.Error())
@@ -126,6 +133,9 @@ func (s *BookServ) GetMineRecord(status string, page, pageSize int) (map[string]
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
+	if page == 0 {
+		page = 1
+	}
 	customer := s.ctx.Get("customer").(model.TaCustomer)
 	list, err := s.dao.GetMineRecord(customer.CustomerId, status, page, pageSize)
 	if err != nil {
@@ -149,6 +159,9 @@ func (s *BookServ) GetInStockChangeByBookId(bookId string, page, pageSize int) (
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
+	if page == 0 {
+		page = 1
+	}
 	list, err := s.dao.GetInStockChangeByBookId(bookId, page, pageSize)
 	if err != nil {
 		utils.LogError("获取库存盘点列表失败: " + err.Error())
@@ -200,12 +213,14 @@ func (s *BookServ) BorrowBook(bookId, customerId, orgId string) (*model.TaBookBo
 		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("借阅失败")
 	}
+	returnTime := book.BorrowDays * 24
+	returnStr := strconv.Itoa(returnTime) + "h"
+	dd, _ := time.ParseDuration(returnStr)
 	if reserveRecord == nil {
 		customer, err := s.cdao.GetCustomerByID(customerId)
 		if err != nil {
@@ -324,6 +339,9 @@ func (s *BookServ) GetCustomerReturnList(customerInfo, caseId string, page, page
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
+	if page == 0 {
+		page = 1
+	}
 	list, err := s.dao.GetCustomerReturnList(customerInfo, caseId, page, pageSize)
 	if err != nil {
 		utils.LogError("获取库存盘点列表失败: " + err.Error())
@@ -402,6 +420,9 @@ func (s *BookServ) GetRecordList(borrowStatus, caseid, customerName, customerPho
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
+	if page == 0 {
+		page = 1
+	}
 	list, err := s.dao.GetRecordList(borrowStatus, caseid, customerName, customerPhone, bookName, barcode, page, pageSize)
 	if err != nil {
 		utils.LogError("获取借书记录列表失败: " + err.Error())