Subversion Repositories SmartDukaan

Rev

Rev 6135 | Rev 6603 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 6135 Rev 6220
Line 12... Line 12...
12
import in.shop2020.logistics.Provider;
12
import in.shop2020.logistics.Provider;
13
import in.shop2020.model.v1.order.Order;
13
import in.shop2020.model.v1.order.Order;
14
import in.shop2020.model.v1.order.OrderStatus;
14
import in.shop2020.model.v1.order.OrderStatus;
15
import in.shop2020.model.v1.order.OrderStatusGroups;
15
import in.shop2020.model.v1.order.OrderStatusGroups;
16
import in.shop2020.model.v1.order.RechargeOrder;
16
import in.shop2020.model.v1.order.RechargeOrder;
-
 
17
import in.shop2020.model.v1.order.RechargeType;
17
import in.shop2020.serving.utils.FormattingUtils;
18
import in.shop2020.serving.utils.FormattingUtils;
18
import in.shop2020.serving.utils.Utils;
19
import in.shop2020.serving.utils.Utils;
19
import in.shop2020.thrift.clients.LogisticsClient;
20
import in.shop2020.thrift.clients.LogisticsClient;
20
import in.shop2020.thrift.clients.TransactionClient;
21
import in.shop2020.thrift.clients.TransactionClient;
21
 
22
 
Line 79... Line 80...
79
        } catch (Exception e)   {
80
        } catch (Exception e)   {
80
            logger.error("Error while getting the recharge orders for the user", e);
81
            logger.error("Error while getting the recharge orders for the user", e);
81
        }
82
        }
82
        if(rechargeOrders != null && !rechargeOrders.isEmpty()){
83
        if(rechargeOrders != null && !rechargeOrders.isEmpty()){
83
            for(RechargeOrder rechargeOrder: rechargeOrders) {
84
            for(RechargeOrder rechargeOrder: rechargeOrders) {
-
 
85
            	if(rechargeOrder.getRechargeType() == RechargeType.MOBILE){
84
                rechargeProviderMap.put(rechargeOrder.getId(), Utils.getRechargeProviderName(rechargeOrder.getOperatorId()));
86
            		rechargeProviderMap.put(rechargeOrder.getId(), Utils.getMobileProvidersMap().get(rechargeOrder.getOperatorId()));
-
 
87
            	}
-
 
88
            	if(rechargeOrder.getRechargeType() == RechargeType.DTH){
-
 
89
            		rechargeProviderMap.put(rechargeOrder.getId(), Utils.getDthProvidersMap().get(rechargeOrder.getOperatorId()));
-
 
90
            	}
85
            }
91
            }
86
        }
92
        }
87
		return "index";
93
		return "index";
88
    }
94
    }
89
    
95