| Line 325... |
Line 325... |
| 325 |
}
|
325 |
}
|
| 326 |
|
326 |
|
| 327 |
if(t_order.isSetLogisticsTransactionId()){
|
327 |
if(t_order.isSetLogisticsTransactionId()){
|
| 328 |
billTogetherOrdersMap = new HashMap<Long, Map<String, String>>();
|
328 |
billTogetherOrdersMap = new HashMap<Long, Map<String, String>>();
|
| 329 |
Map<String, String> orderValuesMap = new HashMap<String, String>();
|
329 |
Map<String, String> orderValuesMap = new HashMap<String, String>();
|
| 330 |
if(t_order.getStatus()==OrderStatus.ACCEPTED){
|
330 |
if(t_order.getStatus()==OrderStatus.ACCEPTED || t_order.getStatus()==OrderStatus.RTO_IN_TRANSIT ){
|
| 331 |
orderValuesMap.put("ProductName", getItemDisplayName(lineItem));
|
331 |
orderValuesMap.put("ProductName", getItemDisplayName(lineItem));
|
| 332 |
orderValuesMap.put("Quantity", lineItem.getQuantity()+"");
|
332 |
orderValuesMap.put("Quantity", lineItem.getQuantity()+"");
|
| 333 |
if(ItemType.SERIALIZED==item.getType()){
|
333 |
if(ItemType.SERIALIZED==item.getType()){
|
| 334 |
orderValuesMap.put("IsSerialized", "true");
|
334 |
orderValuesMap.put("IsSerialized", "true");
|
| 335 |
}else{
|
335 |
}else{
|
| Line 343... |
Line 343... |
| 343 |
billTogetherOrdersMap.put(t_order.getId(), orderValuesMap);
|
343 |
billTogetherOrdersMap.put(t_order.getId(), orderValuesMap);
|
| 344 |
}
|
344 |
}
|
| 345 |
Map<Long, Item> orderItemMap = new HashMap<Long, Item>();
|
345 |
Map<Long, Item> orderItemMap = new HashMap<Long, Item>();
|
| 346 |
List<in.shop2020.model.v1.order.Order> taOrders = new TransactionClient().getClient().getGroupOrdersByLogisticsTxnId(t_order.getLogisticsTransactionId());
|
346 |
List<in.shop2020.model.v1.order.Order> taOrders = new TransactionClient().getClient().getGroupOrdersByLogisticsTxnId(t_order.getLogisticsTransactionId());
|
| 347 |
for(in.shop2020.model.v1.order.Order ord1: taOrders){
|
347 |
for(in.shop2020.model.v1.order.Order ord1: taOrders){
|
| 348 |
if(ord1.getStatus()==OrderStatus.ACCEPTED){
|
348 |
if(ord1.getStatus()==OrderStatus.ACCEPTED || ord1.getStatus()==OrderStatus.RTO_IN_TRANSIT ){
|
| 349 |
if(ord1.getId()== t_order.getId()){
|
349 |
if(ord1.getId()== t_order.getId()){
|
| 350 |
orderItemMap.put(ord1.getId(), item);
|
350 |
orderItemMap.put(ord1.getId(), item);
|
| 351 |
} else {
|
351 |
} else {
|
| 352 |
if(!client.isAlive()){
|
352 |
if(!client.isAlive()){
|
| 353 |
client = new CatalogClient().getClient();
|
353 |
client = new CatalogClient().getClient();
|
| Line 357... |
Line 357... |
| 357 |
}
|
357 |
}
|
| 358 |
}
|
358 |
}
|
| 359 |
}
|
359 |
}
|
| 360 |
|
360 |
|
| 361 |
for(in.shop2020.model.v1.order.Order taOrder: taOrders){
|
361 |
for(in.shop2020.model.v1.order.Order taOrder: taOrders){
|
| 362 |
if(taOrder.getStatus()==OrderStatus.ACCEPTED){
|
362 |
if(taOrder.getStatus()==OrderStatus.ACCEPTED || taOrder.getStatus()==OrderStatus.RTO_IN_TRANSIT ){
|
| 363 |
if(taOrder.getId()==t_order.getId()){
|
363 |
if(taOrder.getId()==t_order.getId()){
|
| 364 |
continue;
|
364 |
continue;
|
| 365 |
} else {
|
365 |
} else {
|
| 366 |
orderValuesMap = new HashMap<String, String>();
|
366 |
orderValuesMap = new HashMap<String, String>();
|
| 367 |
Item orderItem = orderItemMap.get(taOrder.getId());
|
367 |
Item orderItem = orderItemMap.get(taOrder.getId());
|