|
@@ -256,7 +256,7 @@ func List(header *protocol.RequestHeader, request *protocol.OrderListRequest) (r |
|
@@ -256,7 +256,7 @@ func List(header *protocol.RequestHeader, request *protocol.OrderListRequest) (r |
256
|
cumulativeQuantity int
|
256
|
cumulativeQuantity int
|
257
|
)
|
257
|
)
|
258
|
cumulativeQuantity, _, err = OrderDao.OrderStatics(&domain.OrderStaticQuery{
|
258
|
cumulativeQuantity, _, err = OrderDao.OrderStatics(&domain.OrderStaticQuery{
|
259
|
- EndTime: time.Now().Unix() * 1000,
|
259
|
+ EndTime: utils.GetDayEnd().Unix() * 1000,
|
260
|
OrderTypes: domain.UserOrderTypes(domain.Career),
|
260
|
OrderTypes: domain.UserOrderTypes(domain.Career),
|
261
|
PartnerId: request.PartnerId,
|
261
|
PartnerId: request.PartnerId,
|
262
|
PartnerCategoryId: request.JoinWay,
|
262
|
PartnerCategoryId: request.JoinWay,
|
|
@@ -264,6 +264,7 @@ func List(header *protocol.RequestHeader, request *protocol.OrderListRequest) (r |
|
@@ -264,6 +264,7 @@ func List(header *protocol.RequestHeader, request *protocol.OrderListRequest) (r |
264
|
rsp.Total = cumulativeQuantity
|
264
|
rsp.Total = cumulativeQuantity
|
265
|
rsp.Timestamp = time.Now().Unix() * 1000
|
265
|
rsp.Timestamp = time.Now().Unix() * 1000
|
266
|
}
|
266
|
}
|
|
|
267
|
+
|
267
|
//【特殊处理2】 今天累计数量特殊处理 当前查询时间段内所有订单总数(复用rsp.Total字段)
|
268
|
//【特殊处理2】 今天累计数量特殊处理 当前查询时间段内所有订单总数(复用rsp.Total字段)
|
268
|
if request.StartTime > 0 && request.EndTime > 0 {
|
269
|
if request.StartTime > 0 && request.EndTime > 0 {
|
269
|
zero := time.Time(xtime.XTime(time.Now()).DayBefore(0)).Unix()
|
270
|
zero := time.Time(xtime.XTime(time.Now()).DayBefore(0)).Unix()
|
|
@@ -278,8 +279,7 @@ func List(header *protocol.RequestHeader, request *protocol.OrderListRequest) (r |
|
@@ -278,8 +279,7 @@ func List(header *protocol.RequestHeader, request *protocol.OrderListRequest) (r |
278
|
todayQuantity int
|
279
|
todayQuantity int
|
279
|
)
|
280
|
)
|
280
|
todayQuantity, _, err = OrderDao.OrderStatics(&domain.OrderStaticQuery{
|
281
|
todayQuantity, _, err = OrderDao.OrderStatics(&domain.OrderStaticQuery{
|
281
|
- BeginTime: queryOption.BeginTime.Unix() * 1000,
|
|
|
282
|
- //EndTime: time.Now().Unix() * 1000,
|
282
|
+ BeginTime: queryOption.BeginTime.Unix() * 1000,
|
283
|
EndTime: queryOption.EndTime.Unix() * 1000,
|
283
|
EndTime: queryOption.EndTime.Unix() * 1000,
|
284
|
OrderTypes: domain.UserOrderTypes(domain.Career),
|
284
|
OrderTypes: domain.UserOrderTypes(domain.Career),
|
285
|
PartnerId: request.PartnerId,
|
285
|
PartnerId: request.PartnerId,
|