浏览代码

book endDate

胡轶钦 6 年前
父节点
当前提交
3a97a57fd0
共有 1 个文件被更改,包括 22 次插入1 次删除
  1. 22
    1
      service/book/book.go

+ 22
- 1
service/book/book.go 查看文件

8
 	"spaceofcheng/services/models/model"
8
 	"spaceofcheng/services/models/model"
9
 	"spaceofcheng/services/service"
9
 	"spaceofcheng/services/service"
10
 	"spaceofcheng/services/utils"
10
 	"spaceofcheng/services/utils"
11
+	"strconv"
11
 	"time"
12
 	"time"
12
 )
13
 )
13
 
14
 
32
 	if pageSize == 0 {
33
 	if pageSize == 0 {
33
 		pageSize = service.PAGENUM
34
 		pageSize = service.PAGENUM
34
 	}
35
 	}
36
+	if page == 0 {
37
+		page = 1
38
+	}
35
 	list, err := s.dao.GetBookRecommendList(caseid, page, pageSize)
39
 	list, err := s.dao.GetBookRecommendList(caseid, page, pageSize)
36
 	if err != nil {
40
 	if err != nil {
37
 		utils.LogError("获取图书列表失败: " + err.Error())
41
 		utils.LogError("获取图书列表失败: " + err.Error())
49
 	if pageSize == 0 {
53
 	if pageSize == 0 {
50
 		pageSize = service.PAGENUM
54
 		pageSize = service.PAGENUM
51
 	}
55
 	}
56
+	if page == 0 {
57
+		page = 1
58
+	}
52
 	list, err := s.dao.GetBookList(bookType, name, barcode, showzero, caseid, page, pageSize)
59
 	list, err := s.dao.GetBookList(bookType, name, barcode, showzero, caseid, page, pageSize)
53
 	if err != nil {
60
 	if err != nil {
54
 		utils.LogError("获取图书列表失败: " + err.Error())
61
 		utils.LogError("获取图书列表失败: " + err.Error())
126
 	if pageSize == 0 {
133
 	if pageSize == 0 {
127
 		pageSize = service.PAGENUM
134
 		pageSize = service.PAGENUM
128
 	}
135
 	}
136
+	if page == 0 {
137
+		page = 1
138
+	}
129
 	customer := s.ctx.Get("customer").(model.TaCustomer)
139
 	customer := s.ctx.Get("customer").(model.TaCustomer)
130
 	list, err := s.dao.GetMineRecord(customer.CustomerId, status, page, pageSize)
140
 	list, err := s.dao.GetMineRecord(customer.CustomerId, status, page, pageSize)
131
 	if err != nil {
141
 	if err != nil {
149
 	if pageSize == 0 {
159
 	if pageSize == 0 {
150
 		pageSize = service.PAGENUM
160
 		pageSize = service.PAGENUM
151
 	}
161
 	}
162
+	if page == 0 {
163
+		page = 1
164
+	}
152
 	list, err := s.dao.GetInStockChangeByBookId(bookId, page, pageSize)
165
 	list, err := s.dao.GetInStockChangeByBookId(bookId, page, pageSize)
153
 	if err != nil {
166
 	if err != nil {
154
 		utils.LogError("获取库存盘点列表失败: " + err.Error())
167
 		utils.LogError("获取库存盘点列表失败: " + err.Error())
200
 		utils.LogError("借阅失败: " + err.Error())
213
 		utils.LogError("借阅失败: " + err.Error())
201
 		return nil, errors.New("借阅失败")
214
 		return nil, errors.New("借阅失败")
202
 	}
215
 	}
203
-	dd, _ := time.ParseDuration("168h")
204
 	book, err := s.dao.GetBookById(bookId)
216
 	book, err := s.dao.GetBookById(bookId)
205
 	if err != nil {
217
 	if err != nil {
206
 		utils.LogError("借阅失败: " + err.Error())
218
 		utils.LogError("借阅失败: " + err.Error())
207
 		return nil, errors.New("借阅失败")
219
 		return nil, errors.New("借阅失败")
208
 	}
220
 	}
221
+	returnTime := book.BorrowDays * 24
222
+	returnStr := strconv.Itoa(returnTime) + "h"
223
+	dd, _ := time.ParseDuration(returnStr)
209
 	if reserveRecord == nil {
224
 	if reserveRecord == nil {
210
 		customer, err := s.cdao.GetCustomerByID(customerId)
225
 		customer, err := s.cdao.GetCustomerByID(customerId)
211
 		if err != nil {
226
 		if err != nil {
324
 	if pageSize == 0 {
339
 	if pageSize == 0 {
325
 		pageSize = service.PAGENUM
340
 		pageSize = service.PAGENUM
326
 	}
341
 	}
342
+	if page == 0 {
343
+		page = 1
344
+	}
327
 	list, err := s.dao.GetCustomerReturnList(customerInfo, caseId, page, pageSize)
345
 	list, err := s.dao.GetCustomerReturnList(customerInfo, caseId, page, pageSize)
328
 	if err != nil {
346
 	if err != nil {
329
 		utils.LogError("获取库存盘点列表失败: " + err.Error())
347
 		utils.LogError("获取库存盘点列表失败: " + err.Error())
402
 	if pageSize == 0 {
420
 	if pageSize == 0 {
403
 		pageSize = service.PAGENUM
421
 		pageSize = service.PAGENUM
404
 	}
422
 	}
423
+	if page == 0 {
424
+		page = 1
425
+	}
405
 	list, err := s.dao.GetRecordList(borrowStatus, caseid, customerName, customerPhone, bookName, barcode, page, pageSize)
426
 	list, err := s.dao.GetRecordList(borrowStatus, caseid, customerName, customerPhone, bookName, barcode, page, pageSize)
406
 	if err != nil {
427
 	if err != nil {
407
 		utils.LogError("获取借书记录列表失败: " + err.Error())
428
 		utils.LogError("获取借书记录列表失败: " + err.Error())