Subversion Repositories SmartDukaan

Rev

Rev 36598 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 36598 Rev 36626
Line 51... Line 51...
51
import com.spice.profitmandi.service.user.RetailerService;
51
import com.spice.profitmandi.service.user.RetailerService;
52
import com.spice.profitmandi.web.model.LoginDetails;
52
import com.spice.profitmandi.web.model.LoginDetails;
53
import com.spice.profitmandi.web.util.CookiesProcessor;
53
import com.spice.profitmandi.web.util.CookiesProcessor;
54
import com.spice.profitmandi.web.util.MVCResponseSender;
54
import com.spice.profitmandi.web.util.MVCResponseSender;
55
import in.shop2020.model.v1.order.OrderStatus;
55
import in.shop2020.model.v1.order.OrderStatus;
56
import in.shop2020.model.v1.order.TransactionServiceException;
-
 
57
import org.apache.commons.csv.CSVFormat;
56
import org.apache.commons.csv.CSVFormat;
58
import org.apache.commons.csv.CSVParser;
57
import org.apache.commons.csv.CSVParser;
59
import org.apache.commons.csv.CSVRecord;
58
import org.apache.commons.csv.CSVRecord;
60
import org.apache.commons.io.FileUtils;
59
import org.apache.commons.io.FileUtils;
61
import org.apache.commons.lang3.StringUtils;
60
import org.apache.commons.lang3.StringUtils;
62
import org.apache.logging.log4j.LogManager;
61
import org.apache.logging.log4j.LogManager;
63
import org.apache.logging.log4j.Logger;
62
import org.apache.logging.log4j.Logger;
64
import org.apache.thrift.TException;
-
 
65
import org.json.JSONObject;
63
import org.json.JSONObject;
66
import org.springframework.beans.factory.annotation.Autowired;
64
import org.springframework.beans.factory.annotation.Autowired;
67
import org.springframework.beans.factory.annotation.Qualifier;
65
import org.springframework.beans.factory.annotation.Qualifier;
68
import org.springframework.beans.factory.annotation.Value;
66
import org.springframework.beans.factory.annotation.Value;
69
import org.springframework.core.io.ByteArrayResource;
67
import org.springframework.core.io.ByteArrayResource;
Line 907... Line 905...
907
                    model.addAttribute("response1", mvcResponseSender.createResponseString(true));
905
                    model.addAttribute("response1", mvcResponseSender.createResponseString(true));
908
 
906
 
909
                    sdCreditService.settleBlockedLoan(order.getTransactionId(), order.getWalletAmount());
907
                    sdCreditService.settleBlockedLoan(order.getTransactionId(), order.getWalletAmount());
910
                }
908
                }
911
            }
909
            }
912
        } catch (TransactionServiceException | TException e) {
910
        } catch (Exception e) {
913
            model.addAttribute("response1", mvcResponseSender.createResponseString(false));
911
            model.addAttribute("response1", mvcResponseSender.createResponseString(false));
914
 
912
 
915
        }
913
        }
916
 
914
 
917
        return "response";
915
        return "response";