Subversion Repositories SmartDukaan

Rev

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

Rev 2714 Rev 2728
Line 1... Line 1...
1 
package in.shop2020.serving.controllers;
 1 
package in.shop2020.serving.controllers;
2 
 
 2 
 
3 
import in.shop2020.model.v1.order.LineItem;
 3 
import in.shop2020.model.v1.order.LineItem;
4 
import in.shop2020.model.v1.order.Order;
 4 
import in.shop2020.model.v1.order.Order;
- 
 
 5 
import in.shop2020.payments.Attribute;
- 
 
 6 
import in.shop2020.payments.Constants;
5 
import in.shop2020.payments.Payment;
 7 
import in.shop2020.payments.Payment;
- 
 
 8 
import in.shop2020.payments.PaymentException;
6 
import in.shop2020.thrift.clients.PaymentServiceClient;
 9 
import in.shop2020.thrift.clients.PaymentServiceClient;
7 
import in.shop2020.thrift.clients.TransactionServiceClient;
 10 
import in.shop2020.thrift.clients.TransactionServiceClient;
8 
 
 11 
 
9 
import java.text.SimpleDateFormat;
 12 
import java.text.SimpleDateFormat;
10 
import java.util.ArrayList;
 13 
import java.util.ArrayList;
Line 13... Line 16...
13 
import java.util.List;
 16 
import java.util.List;
14 
import java.util.Map;
 17 
import java.util.Map;
15 
import java.util.TimeZone;
 18 
import java.util.TimeZone;
16 
 
 19 
 
17 
import org.apache.log4j.Logger;
 20 
import org.apache.log4j.Logger;
- 
 
 21 
import org.apache.thrift.TApplicationException;
- 
 
 22 
import org.apache.thrift.TException;
18 
 
 23 
 
19 
/**
 24 
/**
20 
 * @author vikas
 25 
 * @author vikas
21 
 *
 26 
 *
22 
 */
 27 
 */
Line 50... Line 55...
50 
        setUserOrderMap(order, sdf);
 55 
        setUserOrderMap(order, sdf);
51 
        setLineItems(order.getLineitems());
 56 
        setLineItems(order.getLineitems());
52 
 
 57 
 
53 
        List<Payment> payments = paymentServiceClient.getClient().getPaymentForTxnId(order.getTransactionId());
 58 
        List<Payment> payments = paymentServiceClient.getClient().getPaymentForTxnId(order.getTransactionId());
54 
        if (payments != null && !payments.isEmpty()) {
 59 
        if (payments != null && !payments.isEmpty()) {
55 
            setPayments(payments, sdf);
 60 
            setPayments(payments, sdf, paymentServiceClient);
56 
        }
 61 
        }
57 
        return "index";
 62 
        return "index";
58 
    }
 63 
    }
59 
 
 64 
 
60 
    private void setPayments(List<Payment> payments, SimpleDateFormat sdf) {
 65 
    private void setPayments(List<Payment> payments, SimpleDateFormat sdf, PaymentServiceClient paymentServiceClient) throws PaymentException, TException {
61 
        paymentsList = new ArrayList<Map<String,String>>();
 66 
        paymentsList = new ArrayList<Map<String,String>>();
62 
        for (Payment payment : payments) {
 67 
        for (Payment payment : payments) {
63 
            Map<String,String> paymentMap = new HashMap<String, String>();
 68 
            Map<String,String> paymentMap = new HashMap<String, String>();
64 
            if (payment.getAuthCode() != null && !payment.getAuthCode().isEmpty()) {
 69 
            if (payment.getAuthCode() != null && !payment.getAuthCode().isEmpty()) {
65 
                paymentMap.put("authcode", payment.getAuthCode());
 70 
                paymentMap.put("authcode", payment.getAuthCode());
Line 88... Line 93...
88 
            if (payment.getSessionId() != null && !payment.getSessionId().isEmpty()) {
 93 
            if (payment.getSessionId() != null && !payment.getSessionId().isEmpty()) {
89 
                paymentMap.put("sessioid", payment.getSessionId());
 94 
                paymentMap.put("sessioid", payment.getSessionId());
90 
            }
 95 
            }
91 
            paymentMap.put("amount", Double.toString(payment.getAmount()));
 96 
            paymentMap.put("amount", Double.toString(payment.getAmount()));
92 
            paymentMap.put("status", payment.getStatus().name());
 97 
            paymentMap.put("status", payment.getStatus().name());
- 
 
 98 
            try {
- 
 
 99 
                paymentMap.put("gatewayname", paymentServiceClient.getClient().getPaymentGateway(payment.getGatewayId()).getName());
- 
 
 100 
            }
- 
 
 101 
            catch (TApplicationException e) {
- 
 
 102 
                log.warn("No payment gateway set", e);
- 
 
 103 
            }
- 
 
 104 
            paymentMap.put("paymethod", getPaymentMethod(payment.getAttributes()));
- 
 
 105
93 
            if (payment.getSuccessTimestamp() != 0) {
 106 
            if (payment.getSuccessTimestamp() != 0) {
94 
                paymentMap.put("successts", sdf.format(new Date(payment.getSuccessTimestamp())));
 107 
                paymentMap.put("successts", sdf.format(new Date(payment.getSuccessTimestamp())));
95 
            }
 108 
            }
96 
            paymentsList.add(paymentMap);
 109 
            paymentsList.add(paymentMap);
97 
        }
 110 
        }
Line 171... Line 184...
171 
        if (order.getCustomer_pincode() != null) {
 184 
        if (order.getCustomer_pincode() != null) {
172 
            address.append(order.getCustomer_pincode());
 185 
            address.append(order.getCustomer_pincode());
173 
        }
 186 
        }
174 
        userOrder.put("shipping", address.toString());
 187 
        userOrder.put("shipping", address.toString());
175 
    }
 188 
    }
- 
 
 189
- 
 
 190 
    public String getPaymentMethod(List<Attribute> paymentAttributes) {
- 
 
 191 
        String paymentMethod = null;
- 
 
 192 
        if(paymentAttributes == null || paymentAttributes.isEmpty()) {
- 
 
 193 
            return "N/A";
- 
 
 194 
        }
- 
 
 195 
        for(Attribute a : paymentAttributes) {
- 
 
 196 
            if("payMethod".equals(a.getName())) {
- 
 
 197 
                paymentMethod = Constants.PAYMENT_METHOD.get(a.getValue());
- 
 
 198 
                break;
- 
 
 199 
            }
- 
 
 200 
        }
- 
 
 201 
        return paymentMethod != null ? paymentMethod : "N/A";
- 
 
 202 
    }
176 
 
 203 
 
177 
    public void setUserId(String userId) {
 204 
    public void setUserId(String userId) {
178 
        try {
 205 
        try {
179 
            this.userId = Long.parseLong(userId);
 206 
            this.userId = Long.parseLong(userId);
180 
        }
 207 
        }