mmm-go / partner · 提交

转到一个项目

作者 yangfu
提交 6e00912a0295fb8d43208e650532c1cfffffa251 1 个父辈 4347ded6

订单列表修改

内嵌 并排对比
正在显示 1 个修改的文件 包含 8 行增加 和 4 行删除
@@ -148,14 +148,16 @@ func OrderList(header *protocol.RequestHeader, request *protocol.OrderListReques @@ -148,14 +148,16 @@ func OrderList(header *protocol.RequestHeader, request *protocol.OrderListReques
148 if request.PageIndex == 0 { 148 if request.PageIndex == 0 {
149 //部分发货的订单数量 149 //部分发货的订单数量
150 rsp.Statistics["partShipmentQuantity"], _, err = OrderDao.OrderStatics(&domain.OrderStaticQuery{ 150 rsp.Statistics["partShipmentQuantity"], _, err = OrderDao.OrderStatics(&domain.OrderStaticQuery{
151 - EndTime: time.Now().Unix() * 1000, 151 + EndTime: request.EndTime,
  152 + BeginTime: request.StartTime,
152 OrderType: domain.OrderReal, 153 OrderType: domain.OrderReal,
153 PartnerId: header.UserId, 154 PartnerId: header.UserId,
154 OrderStatus: domain.OrderStatusDeliverSome, 155 OrderStatus: domain.OrderStatusDeliverSome,
155 }) 156 })
156 //全部发货的订单数量 157 //全部发货的订单数量
157 rsp.Statistics["allShipmentQuantity"], _, err = OrderDao.OrderStatics(&domain.OrderStaticQuery{ 158 rsp.Statistics["allShipmentQuantity"], _, err = OrderDao.OrderStatics(&domain.OrderStaticQuery{
158 - EndTime: time.Now().Unix() * 1000, 159 + EndTime: request.EndTime,
  160 + BeginTime: request.StartTime,
159 OrderType: domain.OrderReal, 161 OrderType: domain.OrderReal,
160 PartnerId: header.UserId, 162 PartnerId: header.UserId,
161 OrderStatus: domain.OrderStatusDeliverAll, 163 OrderStatus: domain.OrderStatusDeliverAll,
@@ -165,13 +167,15 @@ func OrderList(header *protocol.RequestHeader, request *protocol.OrderListReques @@ -165,13 +167,15 @@ func OrderList(header *protocol.RequestHeader, request *protocol.OrderListReques
165 ) 167 )
166 //累计实发订单 168 //累计实发订单
167 cumulativeQuantity, _, err = OrderDao.OrderStatics(&domain.OrderStaticQuery{ 169 cumulativeQuantity, _, err = OrderDao.OrderStatics(&domain.OrderStaticQuery{
168 - EndTime: time.Now().Unix() * 1000, 170 + EndTime: request.EndTime,
  171 + BeginTime: request.StartTime,
169 OrderType: domain.OrderReal, 172 OrderType: domain.OrderReal,
170 PartnerId: header.UserId, 173 PartnerId: header.UserId,
171 }) 174 })
172 //累计意向订单 175 //累计意向订单
173 intentionQuantity, _, err = OrderDao.OrderStatics(&domain.OrderStaticQuery{ 176 intentionQuantity, _, err = OrderDao.OrderStatics(&domain.OrderStaticQuery{
174 - EndTime: time.Now().Unix() * 1000, 177 + EndTime: request.EndTime,
  178 + BeginTime: request.StartTime,
175 OrderType: domain.OrderIntention, 179 OrderType: domain.OrderIntention,
176 PartnerId: header.UserId, 180 PartnerId: header.UserId,
177 }) 181 })