Commit b0b401d5 authored by pborate's avatar pborate

Updated OrderService.java . Added siteCode in path param.

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@176793 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ab37e60d
package proteus.ecm.service;
import java.sql.Connection;
import java.sql.Date;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
......@@ -38,7 +39,7 @@ import ibase.webitm.utility.ITMException;
@Path("/")
@Path("/{siteCode}")
public class OrderService {
private ECMOrderDAO orderDao = new ECMOrderDAO();
private UserActivityDAO userDAO = new UserActivityDAO();
......@@ -51,6 +52,7 @@ public class OrderService {
Connection conn;
@PathParam("siteCode") String siteCode;
@GET
@Path("/order")
......@@ -68,8 +70,8 @@ public class OrderService {
public List<ECMOrder> getOrderList() {
List<ECMOrder> listOrder = new ArrayList<ECMOrder>();
String loginCode = getUniqueId();
String siteCode = getSiteCode();
System.out.println(" loginCode in orders >>[" + loginCode + "] site code ["+siteCode +"]");
// String siteCode = getSiteCode();
System.out.println(" loginCode in orders >>[" + loginCode + "] site code ["+ siteCode +"]");
listOrder = orderDao.getOrderList(loginCode,siteCode);
System.out.println("list of Order getOrderList[ " +listOrder+"]");
return listOrder;
......@@ -83,7 +85,7 @@ public class OrderService {
JSONObject RequestData = new JSONObject(data);
String cacheName = getCacheName();
String uniqueId = getUniqueId();
String siteCode = getSiteCode();
// String siteCode = getSiteCode();
System.out.println("Response Delete cart items after placeOrder RequestData" +RequestData);
// JSONArray checData = RequestData.getJSONArray("orderedItems");
// System.out.println("Response Delete cart items after placeOrder checData" +checData);
......@@ -168,7 +170,7 @@ public class OrderService {
@Produces(MediaType.APPLICATION_JSON)
public Response getSalesRate(@PathParam("itemCode") String itemCode,@PathParam("custCode") String custCode) throws BaseException, Exception {
System.out.println(" Inside Sales Rate..[" +itemCode+"] custCode ["+custCode+"]");
String SiteCode = getSiteCode();
// String SiteCode = getSiteCode();
String uniqueId = getUniqueId();
JSONObject sales=new JSONObject();
double salesRate=0.0;
......@@ -189,7 +191,7 @@ public class OrderService {
} catch (BaseException e) {
e.printStackTrace();
}
salesRate= orderDao.getsalesRate(SiteCode,itemCode,custCode);
salesRate= orderDao.getsalesRate(siteCode,itemCode,custCode);
sales.put("Response", salesRate);
}
......@@ -230,21 +232,41 @@ public class OrderService {
return uniqueId;
}
private String getCacheName() {
System.out.println("Inside save Order getCacheName");
// private String getCacheName() {
// System.out.println("Inside save Order getCacheName");
// HttpSession session = request.getSession();
// System.out.println("Inside getCacheName HttpSession");
// Object siteObj = session.getAttribute("CURRENT_SITE");
// System.out.println("Inside getCacheName siteObj");
// if (siteObj != null && siteObj instanceof SiteMaster) {
// SiteMaster site = (SiteMaster) siteObj;
// String cacheName = "CACHE_" + site.getSiteCode();
// System.out.println("Setting siteCode[" + site.getSiteCode() + "] siteTranDB[" + site.getTranDB() + "]");
// System.out.println("getCacheName [" + cacheName + "]");
// return cacheName;
// }
// else {
// System.out.println("\n getCacheName DEFAULT[" + CacheManager.SYSTEM_CACHE_NAME + "]");
// return CacheManager.SYSTEM_CACHE_NAME;
// }
// }
private String getCacheName()
{
HttpSession session = request.getSession();
System.out.println("Inside getCacheName HttpSession");
Object siteObj = session.getAttribute("CURRENT_SITE");
System.out.println("Inside getCacheName siteObj");
if (siteObj != null && siteObj instanceof SiteMaster) {
SiteMaster site = (SiteMaster) siteObj;
String cacheName = "CACHE_" + site.getSiteCode();
System.out.println("Setting siteCode[" + site.getSiteCode() + "] siteTranDB[" + site.getTranDB() + "]");
System.out.println("getCacheName [" + cacheName + "]");
//Object siteObj = session.getAttribute("CURRENT_SITE");
//if( siteObj != null && siteObj instanceof SiteMaster )
if(siteCode!= null)
{
//SiteMaster site = (SiteMaster) siteObj;
String cacheName = "CACHE_" + siteCode;
System.out.println("Setting siteCode[" + siteCode + "]");
System.out.println("getCacheName ["+cacheName+"]");
return cacheName;
}
else {
System.out.println("\n getCacheName DEFAULT[" + CacheManager.SYSTEM_CACHE_NAME + "]");
else
{
System.out.println("\n getCacheName DEFAULT["+CacheManager.SYSTEM_CACHE_NAME+"]");
return CacheManager.SYSTEM_CACHE_NAME;
}
}
......@@ -265,20 +287,20 @@ public class OrderService {
return responseJson.toString();
}
private String getSiteCode() {
System.out.println("Inside get site code ");
HttpSession session = request.getSession();
Object siteObj = session.getAttribute("CURRENT_SITE");
System.out.println("Inside get site code "+siteObj);
if( siteObj != null && siteObj instanceof SiteMaster )
{
SiteMaster site = (SiteMaster) siteObj;
System.out.println("getSiteCode ["+site.getSiteCode()+"]");
return site.getSiteCode();
}
return null;
}
// private String getSiteCode() {
// System.out.println("Inside get site code ");
// HttpSession session = request.getSession();
// Object siteObj = session.getAttribute("CURRENT_SITE");
// System.out.println("Inside get site code "+siteObj);
// if( siteObj != null && siteObj instanceof SiteMaster )
// {
// SiteMaster site = (SiteMaster) siteObj;
// System.out.println("getSiteCode ["+site.getSiteCode()+"]");
// return site.getSiteCode();
// }
// return null;
// }
//
@GET
@Path("/customers")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment