...
|
...
|
@@ -199,7 +199,8 @@ func List(header *protocol.RequestHeader, request *protocol.OrderListRequest) (r |
|
|
Limit: request.PageSize,
|
|
|
Offset: request.PageSize * request.PageIndex,
|
|
|
//SortByUpdateTime: domain.DESC,
|
|
|
SortByCreateTime: domain.DESC,
|
|
|
//SortByCreateTime: domain.DESC,
|
|
|
SortBySalesTime: domain.DESC,
|
|
|
PartnerId: request.PartnerId,
|
|
|
PartnerCategoryId: request.JoinWay,
|
|
|
OrderType: request.OrderType,
|
...
|
...
|
@@ -211,6 +212,15 @@ func List(header *protocol.RequestHeader, request *protocol.OrderListRequest) (r |
|
|
if request.EndTime > 0 {
|
|
|
queryOption.EndTime = time.Unix(request.EndTime/1000, 0)
|
|
|
}
|
|
|
// 今日订单
|
|
|
if request.IsToday {
|
|
|
timeStr := time.Now().Format("2006-01-02")
|
|
|
t, _ := time.Parse("2006-01-02", timeStr)
|
|
|
beginTimeNum := t.Unix()
|
|
|
endTimeNum := beginTimeNum + 86400
|
|
|
queryOption.BeginTime = time.Unix(beginTimeNum, 0)
|
|
|
queryOption.EndTime = time.Unix(endTimeNum, 0)
|
|
|
}
|
|
|
total, orders, _ = OrderRepository.Find(utils.ObjectJsonToMap(queryOption))
|
|
|
if len(orders) != 0 {
|
|
|
for i := range orders {
|
...
|
...
|
|