作者 陈志颖

feat:增加今日订单统计

@@ -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 {
@@ -79,8 +79,8 @@ func (repository *OrderBaseRepository) Find(queryOptions map[string]interface{}) @@ -79,8 +79,8 @@ func (repository *OrderBaseRepository) Find(queryOptions map[string]interface{})
79 query := NewQuery(tx.Model(&OrderBaseModels), queryOptions) 79 query := NewQuery(tx.Model(&OrderBaseModels), queryOptions)
80 query.SetWhere(`"order_base".partner_id= ?`, "partnerId"). 80 query.SetWhere(`"order_base".partner_id= ?`, "partnerId").
81 SetWhere(`"order_base".order_type= ?`, "orderType"). 81 SetWhere(`"order_base".order_type= ?`, "orderType").
82 - SetWhere(`"order_base".create_time >= ?`, "beginTime").  
83 - SetWhere(`"order_base".create_time < ?`, "endTime"). 82 + SetWhere(`"order_base".sale_date >= ?`, "beginTime").
  83 + SetWhere(`"order_base".sale_date < ?`, "endTime").
84 //SetWhere(`"order_base".is_disable = ?`, "isDisable"). 84 //SetWhere(`"order_base".is_disable = ?`, "isDisable").
85 SetLimit(). 85 SetLimit().
86 SetOrder(`order_base.create_time`, "sortByCreateTime"). 86 SetOrder(`order_base.create_time`, "sortByCreateTime").
@@ -88,7 +88,7 @@ type OrderListRequest struct { @@ -88,7 +88,7 @@ type OrderListRequest struct {
88 PageSize int `json:"pageSize" valid:"Required"` 88 PageSize int `json:"pageSize" valid:"Required"`
89 OrderType int `json:"-"` 89 OrderType int `json:"-"`
90 OrderTypes []int `json:"-"` 90 OrderTypes []int `json:"-"`
91 - 91 + IsToday bool `json:"isToday"`
92 PartnerId int64 `json:"partnerId"` 92 PartnerId int64 `json:"partnerId"`
93 JoinWay int `json:"joinWay"` //合伙方式(0或不传,即所有合伙方式) 93 JoinWay int `json:"joinWay"` //合伙方式(0或不传,即所有合伙方式)
94 } 94 }