Subversion Repositories SmartDukaan

Rev

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

Rev 5407 Rev 6176
Line 1... Line 1...
1
package in.shop2020.serving.controllers;
1
package in.shop2020.serving.controllers;
2
 
2
 
3
import in.shop2020.crm.Activity;
-
 
4
import in.shop2020.crm.ActivityType;
-
 
5
import in.shop2020.crm.CRMService.Client;
-
 
6
import in.shop2020.crm.Ticket;
-
 
7
import in.shop2020.crm.TicketCategory;
3
import in.shop2020.crm.TicketCategory;
8
import in.shop2020.crm.TicketPriority;
-
 
9
import in.shop2020.crm.TicketStatus;
-
 
10
import in.shop2020.model.v1.order.LineItem;
4
import in.shop2020.model.v1.order.LineItem;
11
import in.shop2020.model.v1.order.Order;
5
import in.shop2020.model.v1.order.Order;
12
import in.shop2020.model.v1.order.TransactionServiceException;
6
import in.shop2020.model.v1.order.TransactionServiceException;
13
import in.shop2020.model.v1.user.User;
-
 
14
import in.shop2020.model.v1.user.UserCommunicationException;
7
import in.shop2020.model.v1.user.UserCommunicationException;
15
import in.shop2020.model.v1.user.UserCommunicationType;
8
import in.shop2020.model.v1.user.UserCommunicationType;
16
import in.shop2020.model.v1.user.UserContextException;
-
 
17
import in.shop2020.model.v1.user.UserContextService;
9
import in.shop2020.model.v1.user.UserContextService;
18
import in.shop2020.serving.utils.UserMessage;
10
import in.shop2020.serving.utils.UserMessage;
19
import in.shop2020.thrift.clients.CRMClient;
-
 
20
import in.shop2020.thrift.clients.TransactionClient;
11
import in.shop2020.thrift.clients.TransactionClient;
21
import in.shop2020.thrift.clients.UserClient;
12
import in.shop2020.thrift.clients.UserClient;
22
 
13
 
23
import java.io.IOException;
14
import java.io.IOException;
24
import java.util.ArrayList;
15
import java.util.ArrayList;
25
import java.util.Date;
16
import java.util.Date;
26
import java.util.List;
17
import java.util.List;
27
 
18
 
-
 
19
import org.apache.commons.lang.StringUtils;
28
import org.apache.log4j.Logger;
20
import org.apache.log4j.Logger;
29
import org.apache.thrift.TException;
21
import org.apache.thrift.TException;
30
import org.apache.thrift.transport.TTransportException;
22
import org.apache.thrift.transport.TTransportException;
31
 
23
 
32
/**
24
/**
Line 129... Line 121...
129
            // send requests to us with invalid communication types
121
            // send requests to us with invalid communication types
130
            if (ticketCategory != null) {
122
            if (ticketCategory != null) {
131
                if (request.getParameter("order_id") != null) {
123
                if (request.getParameter("order_id") != null) {
132
                    orderId = Integer.parseInt(request.getParameter("order_id"));
124
                    orderId = Integer.parseInt(request.getParameter("order_id"));
133
                }
125
                }
-
 
126
                if (StringUtils.isNotEmpty(request.getParameter("rechargeOrderNumber"))) {
-
 
127
                	//Valid recharge formats are:
-
 
128
                	//MOBR9999
-
 
129
                	//99999
-
 
130
                	String []strOrder = request.getParameter("rechargeOrderNumber").split("(?<=\\D)(?=\\d)|(?<=\\d)(?=\\D)");
-
 
131
                	if(strOrder.length==2) {
-
 
132
                		orderId = Integer.parseInt(strOrder[1]);
-
 
133
                	} else {
-
 
134
                		orderId = Integer.parseInt(strOrder[0]);
-
 
135
                	}
-
 
136
                }
-
 
137
                
134
 
138
 
135
                String awb = request.getParameter("awb");
139
                String awb = request.getParameter("awb");
-
 
140
                if(StringUtils.isEmpty(awb)){
-
 
141
                	awb = request.getParameter("deviceNumber");
-
 
142
                }
136
                String product = request.getParameter("product");
143
                String product = request.getParameter("product");
137
                String subject = request.getParameter("subject");
144
                String subject = request.getParameter("subject");
138
                String message = request.getParameter("message");
145
                String message = request.getParameter("message");
139
 
146
 
140
                UserContextService.Client userClient = (new UserClient()).getClient();
147
                UserContextService.Client userClient = (new UserClient()).getClient();