|
@@ -53,6 +53,7 @@ func OrderDetail(header *protocol.RequestHeader, request *protocol.OrderDetailRe |
|
@@ -53,6 +53,7 @@ func OrderDetail(header *protocol.RequestHeader, request *protocol.OrderDetailRe |
53
|
OrderQuantity: order.OrderActualCount,
|
53
|
OrderQuantity: order.OrderActualCount,
|
54
|
OrderAmount: order.OrderActualAmount,
|
54
|
OrderAmount: order.OrderActualAmount,
|
55
|
OrderAmountCancel: order.OrderAmountCancel(),
|
55
|
OrderAmountCancel: order.OrderAmountCancel(),
|
|
|
56
|
+ OrderUpdateReason: order.Reason,
|
56
|
OrderDistrict: map[string]interface{}{"id": order.OrderRegionInfo.RegionId, "name": order.OrderRegionInfo.RegionName},
|
57
|
OrderDistrict: map[string]interface{}{"id": order.OrderRegionInfo.RegionId, "name": order.OrderRegionInfo.RegionName},
|
57
|
Customer: protocol.Customer{Uname: order.Buyer.BuyerName, Phone: order.Buyer.ContactInfo},
|
58
|
Customer: protocol.Customer{Uname: order.Buyer.BuyerName, Phone: order.Buyer.ContactInfo},
|
58
|
MyDividend: order.OrderTotalBonus(),
|
59
|
MyDividend: order.OrderTotalBonus(),
|
|
@@ -149,8 +150,7 @@ func OrderList(header *protocol.RequestHeader, request *protocol.OrderListReques |
|
@@ -149,8 +150,7 @@ func OrderList(header *protocol.RequestHeader, request *protocol.OrderListReques |
149
|
if request.PageIndex == 0 {
|
150
|
if request.PageIndex == 0 {
|
150
|
var (
|
151
|
var (
|
151
|
partShipmentQuantity, allShipmentQuantity int
|
152
|
partShipmentQuantity, allShipmentQuantity int
|
152
|
- //cumulativeQuantity,
|
|
|
153
|
- intentionQuantity int
|
153
|
+ cumulativeQuantity, intentionQuantity int
|
154
|
)
|
154
|
)
|
155
|
//部分发货的订单数量
|
155
|
//部分发货的订单数量
|
156
|
partShipmentQuantity, _, err = OrderDao.OrderStatics(&domain.OrderStaticQuery{
|
156
|
partShipmentQuantity, _, err = OrderDao.OrderStatics(&domain.OrderStaticQuery{
|
|
@@ -169,16 +169,16 @@ func OrderList(header *protocol.RequestHeader, request *protocol.OrderListReques |
|
@@ -169,16 +169,16 @@ func OrderList(header *protocol.RequestHeader, request *protocol.OrderListReques |
169
|
OrderStatus: domain.OrderStatusDeliverAll,
|
169
|
OrderStatus: domain.OrderStatusDeliverAll,
|
170
|
})
|
170
|
})
|
171
|
//累计实发订单
|
171
|
//累计实发订单
|
172
|
- //cumulativeQuantity, _, err = OrderDao.OrderStatics(&domain.OrderStaticQuery{
|
|
|
173
|
- // EndTime: request.EndTime,
|
|
|
174
|
- // BeginTime: request.StartTime,
|
|
|
175
|
- // OrderType: domain.OrderReal,
|
|
|
176
|
- // PartnerId: header.UserId,
|
|
|
177
|
- //})
|
172
|
+ cumulativeQuantity, _, err = OrderDao.OrderStatics(&domain.OrderStaticQuery{
|
|
|
173
|
+ EndTime: time.Now().Unix() * 1000,
|
|
|
174
|
+ //BeginTime: request.StartTime,
|
|
|
175
|
+ OrderType: domain.OrderReal,
|
|
|
176
|
+ PartnerId: header.UserId,
|
|
|
177
|
+ })
|
178
|
//累计意向订单
|
178
|
//累计意向订单
|
179
|
intentionQuantity, _, err = OrderDao.OrderStatics(&domain.OrderStaticQuery{
|
179
|
intentionQuantity, _, err = OrderDao.OrderStatics(&domain.OrderStaticQuery{
|
180
|
- EndTime: request.EndTime,
|
|
|
181
|
- BeginTime: request.StartTime,
|
180
|
+ EndTime: time.Now().Unix() * 1000,
|
|
|
181
|
+ //BeginTime: request.StartTime,
|
182
|
OrderType: domain.OrderIntention,
|
182
|
OrderType: domain.OrderIntention,
|
183
|
PartnerId: header.UserId,
|
183
|
PartnerId: header.UserId,
|
184
|
})
|
184
|
})
|
|
@@ -186,7 +186,7 @@ func OrderList(header *protocol.RequestHeader, request *protocol.OrderListReques |
|
@@ -186,7 +186,7 @@ func OrderList(header *protocol.RequestHeader, request *protocol.OrderListReques |
186
|
rsp.Statistics["partShipmentQuantity"] = partShipmentQuantity
|
186
|
rsp.Statistics["partShipmentQuantity"] = partShipmentQuantity
|
187
|
rsp.Statistics["allShipmentQuantity"] = allShipmentQuantity
|
187
|
rsp.Statistics["allShipmentQuantity"] = allShipmentQuantity
|
188
|
rsp.Statistics["orderQuantity"] = partShipmentQuantity + allShipmentQuantity //所有订单 = 部分发货 + 已经发货
|
188
|
rsp.Statistics["orderQuantity"] = partShipmentQuantity + allShipmentQuantity //所有订单 = 部分发货 + 已经发货
|
189
|
- rsp.Statistics["cumulativeQuantity"] = partShipmentQuantity + allShipmentQuantity //实发订单 = 部分发货 + 全部发货
|
189
|
+ rsp.Statistics["cumulativeQuantity"] = cumulativeQuantity //实发订单 = 部分发货 + 全部发货
|
190
|
rsp.Statistics["intentionQuantity"] = intentionQuantity
|
190
|
rsp.Statistics["intentionQuantity"] = intentionQuantity
|
191
|
|
191
|
|
192
|
}
|
192
|
}
|
|
@@ -207,7 +207,7 @@ func DomainOrderToOrderListItem(order *domain.Order) *protocol.OrderListItem { |
|
@@ -207,7 +207,7 @@ func DomainOrderToOrderListItem(order *domain.Order) *protocol.OrderListItem { |
207
|
OrderType: order.OrderType,
|
207
|
OrderType: order.OrderType,
|
208
|
OrderNo: order.OrderCode,
|
208
|
OrderNo: order.OrderCode,
|
209
|
OrderName: order.OrderName,
|
209
|
OrderName: order.OrderName,
|
210
|
- OrderAmount: order.OrderAmount,
|
210
|
+ OrderAmount: order.OrderActualAmount,
|
211
|
OrderActualCount: order.OrderActualCount,
|
211
|
OrderActualCount: order.OrderActualCount,
|
212
|
OrderStatus: order.OrderStatus,
|
212
|
OrderStatus: order.OrderStatus,
|
213
|
UpdateTime: order.UpdateAt.Unix() * 1000,
|
213
|
UpdateTime: order.UpdateAt.Unix() * 1000,
|