| Line 3... |
Line 3... |
| 3 |
import in.shop2020.hotspot.dashbaord.server.OrderPromisedShippingComparator;
|
3 |
import in.shop2020.hotspot.dashbaord.server.OrderPromisedShippingComparator;
|
| 4 |
import in.shop2020.hotspot.dashbaord.shared.actions.Order;
|
4 |
import in.shop2020.hotspot.dashbaord.shared.actions.Order;
|
| 5 |
import in.shop2020.hotspot.dashbaord.shared.actions.OrderAlert;
|
5 |
import in.shop2020.hotspot.dashbaord.shared.actions.OrderAlert;
|
| 6 |
import in.shop2020.hotspot.dashbaord.shared.actions.OrderType;
|
6 |
import in.shop2020.hotspot.dashbaord.shared.actions.OrderType;
|
| 7 |
import in.shop2020.hotspot.dashbaord.shared.actions.ReturnOrder;
|
7 |
import in.shop2020.hotspot.dashbaord.shared.actions.ReturnOrder;
|
| - |
|
8 |
import in.shop2020.model.v1.inventory.InventoryService;
|
| 8 |
import in.shop2020.model.v1.inventory.InventoryType;
|
9 |
import in.shop2020.model.v1.inventory.InventoryType;
|
| 9 |
import in.shop2020.model.v1.inventory.WarehouseType;
|
10 |
import in.shop2020.model.v1.inventory.WarehouseType;
|
| 10 |
import in.shop2020.model.v1.catalog.Item;
|
11 |
import in.shop2020.model.v1.catalog.Item;
|
| 11 |
import in.shop2020.model.v1.catalog.ItemType;
|
12 |
import in.shop2020.model.v1.catalog.ItemType;
|
| 12 |
import in.shop2020.model.v1.inventory.Warehouse;
|
13 |
import in.shop2020.model.v1.inventory.Warehouse;
|
| Line 435... |
Line 436... |
| 435 |
for(in.shop2020.logistics.Provider provider : providers){
|
436 |
for(in.shop2020.logistics.Provider provider : providers){
|
| 436 |
providersMap.put(provider.getId(), provider);
|
437 |
providersMap.put(provider.getId(), provider);
|
| 437 |
}
|
438 |
}
|
| 438 |
|
439 |
|
| 439 |
in.shop2020.model.v1.order.TransactionService.Client tClient = new TransactionClient().getClient();
|
440 |
in.shop2020.model.v1.order.TransactionService.Client tClient = new TransactionClient().getClient();
|
| - |
|
441 |
InventoryClient inventoryServiceClient = new InventoryClient();
|
| - |
|
442 |
InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
|
| 440 |
for(in.shop2020.model.v1.order.Order t_order : orders){
|
443 |
for(in.shop2020.model.v1.order.Order t_order : orders){
|
| 441 |
LineItem lineItem = t_order.getLineitems().get(0);
|
444 |
LineItem lineItem = t_order.getLineitems().get(0);
|
| 442 |
String pickFromWarehouse = warehousesMap.get(t_order.getFulfilmentWarehouseId()).getDisplayName();
|
445 |
String pickFromWarehouse = warehousesMap.get(t_order.getFulfilmentWarehouseId()).getDisplayName();
|
| 443 |
Item item = itemsMap.get(lineItem.getItem_id());
|
446 |
Item item = itemsMap.get(lineItem.getItem_id());
|
| 444 |
in.shop2020.logistics.Provider provider = providersMap.get(t_order.getLogistics_provider_id());
|
447 |
in.shop2020.logistics.Provider provider = providersMap.get(t_order.getLogistics_provider_id());
|
| Line 480... |
Line 483... |
| 480 |
&& taOrder.getLogistics_provider_id()==t_order.getLogistics_provider_id()
|
483 |
&& taOrder.getLogistics_provider_id()==t_order.getLogistics_provider_id()
|
| 481 |
&& taOrder.isLogisticsCod()==t_order.isLogisticsCod() && taOrder.getWarehouse_id() == t_order.getWarehouse_id()
|
484 |
&& taOrder.isLogisticsCod()==t_order.isLogisticsCod() && taOrder.getWarehouse_id() == t_order.getWarehouse_id()
|
| 482 |
&& taOrder.getOrderType() == t_order.getOrderType() && taOrder.getPickupStoreId() == t_order.getPickupStoreId()){
|
485 |
&& taOrder.getOrderType() == t_order.getOrderType() && taOrder.getPickupStoreId() == t_order.getPickupStoreId()){
|
| 483 |
orderValuesMap.put("ProductName", getItemDisplayName(lineItem1));
|
486 |
orderValuesMap.put("ProductName", getItemDisplayName(lineItem1));
|
| 484 |
orderValuesMap.put("Quantity", lineItem1.getQuantity()+"");
|
487 |
orderValuesMap.put("Quantity", lineItem1.getQuantity()+"");
|
| - |
|
488 |
if(warehousesMap.containsKey(taOrder.getFulfilmentWarehouseId())){
|
| 485 |
fulfillmentWarehouse = warehousesMap.get(taOrder.getFulfilmentWarehouseId());
|
489 |
fulfillmentWarehouse = warehousesMap.get(taOrder.getFulfilmentWarehouseId());
|
| - |
|
490 |
}else{
|
| - |
|
491 |
try{
|
| - |
|
492 |
fulfillmentWarehouse = inventoryClient.getWarehouse(taOrder.getFulfilmentWarehouseId());
|
| - |
|
493 |
warehousesMap.put(fulfillmentWarehouse.getId(), fulfillmentWarehouse);
|
| - |
|
494 |
}
|
| - |
|
495 |
catch(Exception ie){
|
| - |
|
496 |
ie.printStackTrace();
|
| - |
|
497 |
inventoryClient = inventoryServiceClient.getClient();
|
| - |
|
498 |
fulfillmentWarehouse = inventoryClient.getWarehouse(taOrder.getFulfilmentWarehouseId());
|
| - |
|
499 |
warehousesMap.put(fulfillmentWarehouse.getId(), fulfillmentWarehouse);
|
| - |
|
500 |
}
|
| - |
|
501 |
}
|
| 486 |
orderValuesMap.put("WarehouseType", fulfillmentWarehouse.getWarehouseType().toString());
|
502 |
orderValuesMap.put("WarehouseType", fulfillmentWarehouse.getWarehouseType().toString());
|
| 487 |
orderValuesMap.put("Promised_Shipping", sdf.format(new Date(taOrder.getPromised_shipping_time())));
|
503 |
orderValuesMap.put("Promised_Shipping", sdf.format(new Date(taOrder.getPromised_shipping_time())));
|
| 488 |
orderValuesMap.put("UnitPrice", rformatter.format(lineItem1.getUnit_price()));
|
504 |
orderValuesMap.put("UnitPrice", rformatter.format(lineItem1.getUnit_price()));
|
| 489 |
orderValuesMap.put("Weight", formatter.format(lineItem1.getUnit_weight()));
|
505 |
orderValuesMap.put("Weight", formatter.format(lineItem1.getUnit_weight()));
|
| 490 |
if(itemsMap.containsKey(lineItem1.getItem_id())){
|
506 |
if(itemsMap.containsKey(lineItem1.getItem_id())){
|