| Line 5... |
Line 5... |
| 5 |
import in.shop2020.hotspot.dashbaord.shared.actions.ReturnOrder;
|
5 |
import in.shop2020.hotspot.dashbaord.shared.actions.ReturnOrder;
|
| 6 |
import in.shop2020.model.v1.catalog.InventoryType;
|
6 |
import in.shop2020.model.v1.catalog.InventoryType;
|
| 7 |
import in.shop2020.model.v1.catalog.Item;
|
7 |
import in.shop2020.model.v1.catalog.Item;
|
| 8 |
import in.shop2020.model.v1.catalog.ItemType;
|
8 |
import in.shop2020.model.v1.catalog.ItemType;
|
| 9 |
import in.shop2020.model.v1.catalog.Warehouse;
|
9 |
import in.shop2020.model.v1.catalog.Warehouse;
|
| 10 |
import in.shop2020.model.v1.catalog.WarehouseType;
|
- |
|
| 11 |
import in.shop2020.model.v1.order.LineItem;
|
10 |
import in.shop2020.model.v1.order.LineItem;
|
| 12 |
import in.shop2020.model.v1.order.OrderStatus;
|
11 |
import in.shop2020.model.v1.order.OrderStatus;
|
| 13 |
import in.shop2020.model.v1.order.TransactionService.Client;
|
12 |
import in.shop2020.model.v1.order.TransactionService.Client;
|
| 14 |
import in.shop2020.thrift.clients.CatalogClient;
|
13 |
import in.shop2020.thrift.clients.CatalogClient;
|
| 15 |
import in.shop2020.thrift.clients.TransactionClient;
|
14 |
import in.shop2020.thrift.clients.TransactionClient;
|
| Line 129... |
Line 128... |
| 129 |
|
128 |
|
| 130 |
List<OrderStatus> statuses = new ArrayList<OrderStatus>();
|
129 |
List<OrderStatus> statuses = new ArrayList<OrderStatus>();
|
| 131 |
statuses.add(OrderStatus.BILLED);
|
130 |
statuses.add(OrderStatus.BILLED);
|
| 132 |
List<in.shop2020.model.v1.order.Order> torders = c.getOrdersInBatch(statuses, 0, 0, warehouseId);
|
131 |
List<in.shop2020.model.v1.order.Order> torders = c.getOrdersInBatch(statuses, 0, 0, warehouseId);
|
| 133 |
for(in.shop2020.model.v1.order.Order torder: torders){
|
132 |
for(in.shop2020.model.v1.order.Order torder: torders){
|
| 134 |
if(torder.getLogistics_provider_id() == provider_id && torder.isCod() == cod){
|
133 |
if(torder.getLogistics_provider_id() == provider_id && torder.isLogisticsCod() == cod){
|
| 135 |
orders.add(torder.getId());
|
134 |
orders.add(torder.getId());
|
| 136 |
}
|
135 |
}
|
| 137 |
}
|
136 |
}
|
| 138 |
|
137 |
|
| 139 |
}catch(Exception e){
|
138 |
}catch(Exception e){
|
| Line 266... |
Line 265... |
| 266 |
lineItem.getSerial_number(),
|
265 |
lineItem.getSerial_number(),
|
| 267 |
t_order.getBatchNo(),
|
266 |
t_order.getBatchNo(),
|
| 268 |
t_order.getSerialNo(),
|
267 |
t_order.getSerialNo(),
|
| 269 |
t_order.isDoaFlag(),
|
268 |
t_order.isDoaFlag(),
|
| 270 |
t_order.getPickupRequestNo(),
|
269 |
t_order.getPickupRequestNo(),
|
| 271 |
t_order.isCod(),
|
270 |
t_order.isLogisticsCod(),
|
| 272 |
delayReason,
|
271 |
delayReason,
|
| 273 |
pickFromWarehouse,
|
272 |
pickFromWarehouse,
|
| 274 |
ItemType.SERIALIZED.equals(item.getType()),
|
273 |
ItemType.SERIALIZED.equals(item.getType()),
|
| 275 |
item.isHasItemNo(),
|
274 |
item.isHasItemNo(),
|
| 276 |
t_order.getFulfilmentWarehouseId());
|
275 |
t_order.getFulfilmentWarehouseId());
|