|
@@ -199,7 +199,8 @@ func List(header *protocol.RequestHeader, request *protocol.OrderListRequest) (r |
|
@@ -199,7 +199,8 @@ func List(header *protocol.RequestHeader, request *protocol.OrderListRequest) (r |
|
199
|
Limit: request.PageSize,
|
199
|
Limit: request.PageSize,
|
|
200
|
Offset: request.PageSize * request.PageIndex,
|
200
|
Offset: request.PageSize * request.PageIndex,
|
|
201
|
//SortByUpdateTime: domain.DESC,
|
201
|
//SortByUpdateTime: domain.DESC,
|
|
202
|
- SortByCreateTime: domain.DESC,
|
202
|
+ //SortByCreateTime: domain.DESC,
|
|
|
|
203
|
+ SortBySalesTime: domain.DESC,
|
|
203
|
PartnerId: request.PartnerId,
|
204
|
PartnerId: request.PartnerId,
|
|
204
|
PartnerCategoryId: request.JoinWay,
|
205
|
PartnerCategoryId: request.JoinWay,
|
|
205
|
OrderType: request.OrderType,
|
206
|
OrderType: request.OrderType,
|
|
@@ -211,6 +212,15 @@ func List(header *protocol.RequestHeader, request *protocol.OrderListRequest) (r |
|
@@ -211,6 +212,15 @@ func List(header *protocol.RequestHeader, request *protocol.OrderListRequest) (r |
|
211
|
if request.EndTime > 0 {
|
212
|
if request.EndTime > 0 {
|
|
212
|
queryOption.EndTime = time.Unix(request.EndTime/1000, 0)
|
213
|
queryOption.EndTime = time.Unix(request.EndTime/1000, 0)
|
|
213
|
}
|
214
|
}
|
|
|
|
215
|
+ // 今日订单
|
|
|
|
216
|
+ if request.IsToday {
|
|
|
|
217
|
+ timeStr := time.Now().Format("2006-01-02")
|
|
|
|
218
|
+ t, _ := time.Parse("2006-01-02", timeStr)
|
|
|
|
219
|
+ beginTimeNum := t.Unix()
|
|
|
|
220
|
+ endTimeNum := beginTimeNum + 86400
|
|
|
|
221
|
+ queryOption.BeginTime = time.Unix(beginTimeNum, 0)
|
|
|
|
222
|
+ queryOption.EndTime = time.Unix(endTimeNum, 0)
|
|
|
|
223
|
+ }
|
|
214
|
total, orders, _ = OrderRepository.Find(utils.ObjectJsonToMap(queryOption))
|
224
|
total, orders, _ = OrderRepository.Find(utils.ObjectJsonToMap(queryOption))
|
|
215
|
if len(orders) != 0 {
|
225
|
if len(orders) != 0 {
|
|
216
|
for i := range orders {
|
226
|
for i := range orders {
|