Subversion Repositories SmartDukaan

Rev

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

Rev 18341 Rev 18342
Line 95... Line 95...
95 
    private String            customerMobileNumber;
 95 
    private String            customerMobileNumber;
96 
    private User              user;
 96 
    private User              user;
97 
    private String            orderStatus;
 97 
    private String            orderStatus;
98 
    private List<Order>       orders;
 98 
    private List<Order>       orders;
99 
    private Map<Long, Order>       transactions;
 99 
    private Map<Long, Order>       transactions;
100 
	private Map<Long, Double>    transactionShipping;
 100 
	private Map<Long, Long>    transactionShipping;
101 
    private Map<Long, Double>    transactionTotal;
 101 
    private Map<Long, Long>    transactionTotal;
102 
    private List<Payment>     payments;
 102 
    private List<Payment>     payments;
103 
    private String            escalate;
 103 
    private String            escalate;
104 
    private String            cancelReason;
 104 
    private String            cancelReason;
105 
    private String            transactionId;
 105 
    private String            transactionId;
106 
    private String            pickupExtension;
 106 
    private String            pickupExtension;
Line 186... Line 186...
186 
                                Collections.singletonList(OrderStatus.COD_VERIFICATION_PENDING))) {
 186 
                                Collections.singletonList(OrderStatus.COD_VERIFICATION_PENDING))) {
187 
                    log.info("Processing Order: " + order);
 187 
                    log.info("Processing Order: " + order);
188 
                    if (order.isCod()) {
 188 
                    if (order.isCod()) {
189 
                    	transactions.put(order.getTransactionId(), order);
 189 
                    	transactions.put(order.getTransactionId(), order);
190 
                    	if (transactionShipping.get(order.getTransactionId()) == null){
 190 
                    	if (transactionShipping.get(order.getTransactionId()) == null){
191 
                    		transactionShipping.put(order.getTransactionId(), order.getShippingCost());
 191 
                    		transactionShipping.put(order.getTransactionId(), (long)order.getShippingCost());
192 
                    	} else {
 192 
                    	} else {
193 
                    		transactionShipping.put(order.getTransactionId(), transactionShipping.get(order.getTransactionId()) + order.getShippingCost());
 193 
                    		transactionShipping.put(order.getTransactionId(), transactionShipping.get(order.getTransactionId()).longValue() + (long)order.getShippingCost());
194 
                    	}
 194 
                    	}
195 
                    	if (transactionTotal.get(order.getTransactionId()) == null){
 195 
                    	if (transactionTotal.get(order.getTransactionId()) == null){
196 
                    		transactionTotal.put(order.getTransactionId(), order.getTotal_amount()-order.getGvAmount());
 196 
                    		transactionTotal.put(order.getTransactionId(), (long)order.getTotal_amount()-(long)order.getGvAmount());
197 
                    	} else {
 197 
                    	} else {
198 
                    		transactionTotal.put(order.getTransactionId(), transactionTotal.get(order.getTransactionId()) + order.getTotal_amount()-order.getGvAmount());
 198 
                    		transactionTotal.put(order.getTransactionId(), transactionTotal.get(order.getTransactionId()).longValue() + (long)order.getTotal_amount()-(long)order.getGvAmount());
199 
                    	}
 199 
                    	}
200 
                    	transactions.put(order.getTransactionId(), order);
 200 
                    	transactions.put(order.getTransactionId(), order);
201 
                        orders.add(order);
 201 
                        orders.add(order);
202 
                    }
 202 
                    }
203 
                }
 203 
                }
Line 1722... Line 1722...
1722 
 
 1722 
 
1723 
	public void setTransactions(Map<Long, Order> transactions) {
 1723 
	public void setTransactions(Map<Long, Order> transactions) {
1724 
		this.transactions = transactions;
 1724 
		this.transactions = transactions;
1725 
	}
 1725 
	}
1726 
 
 1726 
 
1727 
	public Map<Long, Double> getTransactionShipping() {
 1727 
	public Map<Long, Long> getTransactionShipping() {
1728 
		return transactionShipping;
 1728 
		return transactionShipping;
1729 
	}
 1729 
	}
1730 
 
 1730 
 
1731 
	public void setTransactionShipping(Map<Long, Double> transactionShipping) {
 1731 
	public void setTransactionShipping(Map<Long, Long> transactionShipping) {
1732 
		this.transactionShipping = transactionShipping;
 1732 
		this.transactionShipping = transactionShipping;
1733 
	}
 1733 
	}
1734 
 
 1734 
 
1735 
	public Map<Long, Double> getTransactionTotal() {
 1735 
	public Map<Long, Long> getTransactionTotal() {
1736 
		return transactionTotal;
 1736 
		return transactionTotal;
1737 
	}
 1737 
	}
1738 
 
 1738 
 
1739 
	public void setTransactionTotal(Map<Long, Double> transactionTotal) {
 1739 
	public void setTransactionTotal(Map<Long, Long> transactionTotal) {
1740 
		this.transactionTotal = transactionTotal;
 1740 
		this.transactionTotal = transactionTotal;
1741 
	}
 1741 
	}
1742 
}
 1742 
}