Skip to content

B
business-java
Commit bc7370bd authored by pborate's avatar pborate
Browse files
Options

Updated ECMOrderDAO, ProductDAO, UserActivityDAO 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@174929 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ff126174
Show whitespace changes
Inline Side-by-side
Showing with 117 additions and 37 deletions
ecm/webitm-ecm/trunk/proteus-ecm/proteus/ecm/hibernate/dao/ECMOrderDAO.java
View file @ bc7370bd
...@@ -95,7 +95,7 @@ public class ECMOrderDAO { ...@@ -95,7 +95,7 @@ public class ECMOrderDAO {
return orderList; return orderList;
} }
public String saveOrder(String uniqueId,String cacheName,String data,String siteCode ,Object auth_user, Object contexObject ) throws JSONException{ public String saveOrder(String uniqueId,String cacheName,String data, String siteCode ,Object auth_user, Object contexObject ) throws JSONException{
JSONObject requestData = new JSONObject(data); JSONObject requestData = new JSONObject(data);
System.out.println("Inside save Order Dao data is" +data); System.out.println("Inside save Order Dao data is" +data);
String returnString ; String returnString ;
...@@ -370,7 +370,7 @@ public class ECMOrderDAO { ...@@ -370,7 +370,7 @@ public class ECMOrderDAO {
// </Detail1> // </Detail1>
finalXML.append( getDetail1XML(objName, requestData,cartMap, cacheName) ); finalXML.append( getDetail1XML(objName, requestData,cartMap, cacheName) );
finalXML.append( getDetail2XML(objName, cartMap, cacheName) ); finalXML.append( getDetail2XML(objName, requestData,cartMap, cacheName) );
finalXML.append("</Header0>"); finalXML.append("</Header0>");
finalXML.append("</group0>"); finalXML.append("</group0>");
...@@ -382,13 +382,64 @@ public class ECMOrderDAO { ...@@ -382,13 +382,64 @@ public class ECMOrderDAO {
private String getDetail1XML(String objName, JSONObject requestData, Map<String, String> cartMap, String cacheName ) throws ITMException, BaseException, Exception private String getDetail1XML(String objName, JSONObject requestData, Map<String, String> cartMap, String cacheName ) throws ITMException, BaseException, Exception
{ {
StringBuffer detailBuff = new StringBuffer(); StringBuffer detailBuff = new StringBuffer();
System.out.println("getDetail1XML" + cartMap);
String ecm_type =requestData.getString("ecm_type");
System.out.println("getDetail1XML cart map data [" + cartMap +"] ecm_type :" +ecm_type);
System.out.println("cartMap.size() getDetail1XML" + cartMap.size()); System.out.println("cartMap.size() getDetail1XML" + cartMap.size());
List<String > keySet=new ArrayList<String>( cartMap.keySet()); List<String > keySet=new ArrayList<String>( cartMap.keySet());
System.out.println("cartMap.keySet() getDetail1XML" + keySet); System.out.println("cartMap.keySet() getDetail1XML" + keySet);
double itemCostRate = 0; double orderAmount = 0;
for (Iterator iterator = keySet.iterator(); iterator.hasNext();) { double orderDiscAmount = 0;
String itemCode = (String) iterator.next(); double orderNetAmount = 0;
System.out.println("cartMap.keySet() getDetail1XML requestData" + requestData);
JSONObject billAddress = new JSONObject();
billAddress=requestData.getJSONObject("billAddress");
System.out.println("cartMap.keySet() getDetail1XML billAddress" + billAddress);
String addr1 = billAddress.getString("addr1");
String addr2 = billAddress.getString("addr2");
String addr3 = billAddress.getString("addr3");
String countDescr = billAddress.getString("countDescr");
String stateDescr = billAddress.getString("stateDescr");
String pinCode = billAddress.getString("pinCode");
String city = billAddress.getString("city");
String addrUse = billAddress.getString("addrUse");
System.out.println("cartMap.keySet() getDetail1XML addrUse" + addrUse);
String dlvAdd ="";
//String billAdd=addr1.concat(addr2).concat(addr3).concat(city).concat(countDescr).concat(stateDescr).concat(pinCode);
String billAdd=addr1+" "+addr2+" "+addr3+" "+city+" " +countDescr+" "+stateDescr+" "+pinCode;
char addrUsed=addrUse.charAt(0);
if(addrUsed=='D')
{
System.out.println("getDetail1XML addrUse in if" + addrUse);
dlvAdd=billAdd;
billAdd="";
System.out.println("getDetail1XML dlvAdd in if" + dlvAdd);
}
else if(addrUsed=='A'){
dlvAdd=billAdd;
}
JSONArray orderedItems = new JSONArray();
orderedItems=requestData.getJSONArray("orderedItems");
int itemQuantity=0;
System.out.println("cartMap.keySet() getDetail1XML orderedItems" + orderedItems);
// for(int i = 0; i < orderedItems.length(); i++){
// JSONObject jsonObj = orderedItems.getJSONObject(i);
// itemQuantity = jsonObj.getInt("itemQuantity");
// System.out.println("cartMap.keySet() getDetail1XML itemQuantity" + itemQuantity);
// }
// for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
for(int i = 0; i < orderedItems.length(); i++){
JSONObject jsonObj = orderedItems.getJSONObject(i);
itemQuantity = jsonObj.getInt("itemQuantity");
System.out.println("cartMap.keySet() getDetail1XML itemQuantity" + itemQuantity);
String itemCode = jsonObj.getString("itemCode");
System.out.println("cartMap.keySet() getDetail1XML itemQuantity" + itemCode);
ItemDetails itemDetail = productCache.getCachedItemDetail(itemCode, cacheName); ItemDetails itemDetail = productCache.getCachedItemDetail(itemCode, cacheName);
if( itemDetail == null ) if( itemDetail == null )
{ {
...@@ -396,8 +447,15 @@ public class ECMOrderDAO { ...@@ -396,8 +447,15 @@ public class ECMOrderDAO {
itemDetail = productCache.getCachedItemDetail(itemCode, cacheName); itemDetail = productCache.getCachedItemDetail(itemCode, cacheName);
} }
JSONObject itemHeader = new JSONObject(itemDetail.getItemHeader()); JSONObject itemHeader = new JSONObject(itemDetail.getItemHeader());
System.out.println("itemHeader.getDouble(itemCostRate) [" + itemHeader.getDouble("itemCostRate") +"] and discountrate [" + itemHeader.getDouble("itemDiscountedRate") +"]");
orderAmount =orderAmount + (itemHeader.getDouble("itemCostRate") * itemQuantity );
orderNetAmount =orderNetAmount + (itemHeader.getDouble("itemDiscountedRate") * itemQuantity ) ;
orderDiscAmount =orderAmount-orderNetAmount;
} }
System.out.println("orderAmount" + orderAmount);
System.out.println("orderDiscAmount" + orderDiscAmount);
System.out.println("orderNetAmount" + orderNetAmount);
detailBuff.append("<Detail1 dbID=\"\" domID=\"1\" objContext=\"1\" objName=\"" + objName + "\">"); detailBuff.append("<Detail1 dbID=\"\" domID=\"1\" objContext=\"1\" objName=\"" + objName + "\">");
detailBuff.append("<attribute pkNames=\"\" selected=\"N\" status=\"N\" updateFlag=\"A\" />"); detailBuff.append("<attribute pkNames=\"\" selected=\"N\" status=\"N\" updateFlag=\"A\" />");
detailBuff.append("<eorder_no>").append("<![CDATA[]]>").append("</eorder_no>"); detailBuff.append("<eorder_no>").append("<![CDATA[]]>").append("</eorder_no>");
...@@ -408,18 +466,19 @@ public class ECMOrderDAO { ...@@ -408,18 +466,19 @@ public class ECMOrderDAO {
detailBuff.append("<order_date>").append("<![CDATA[ " + genericUtility.getValidDateString(new Date(), genericUtility.getApplDateFormat() ) +"]]>").append("</order_date>"); detailBuff.append("<order_date>").append("<![CDATA[ " + genericUtility.getValidDateString(new Date(), genericUtility.getApplDateFormat() ) +"]]>").append("</order_date>");
detailBuff.append("<order_stat>").append("<![CDATA[]]>").append("</order_stat>"); detailBuff.append("<order_stat>").append("<![CDATA[]]>").append("</order_stat>");
detailBuff.append("<stat_date>").append("<![CDATA[]]>").append("</stat_date>"); detailBuff.append("<stat_date>").append("<![CDATA[]]>").append("</stat_date>");
detailBuff.append("<dlv_address>").append("<![CDATA[]]>").append("</dlv_address>"); detailBuff.append("<dlv_address>").append("<![CDATA[" + dlvAdd + "]]>").append("</dlv_address>");
detailBuff.append("<bill_address>").append("<![CDATA[" + getAddress(requestData) + "]]>").append("</bill_address>"); detailBuff.append("<bill_address>").append("<![CDATA[ "+ billAdd +" ]]>").append("</bill_address>");
detailBuff.append("<amount>").append("<![CDATA["+ itemCostRate +"]]>").append("</amount>"); detailBuff.append("<amount>").append("<![CDATA["+ orderAmount +"]]>").append("</amount>");
detailBuff.append("<tax_amt>").append("<![CDATA[0]]>").append("</tax_amt>"); detailBuff.append("<tax_amt>").append("<![CDATA[0]]>").append("</tax_amt>");
detailBuff.append("<disc_amt>").append("<![CDATA[0]]>").append("</disc_amt>"); detailBuff.append("<disc_amt>").append("<![CDATA["+orderDiscAmount+"]]>").append("</disc_amt>");
detailBuff.append("<promo_amt>").append("<![CDATA[0]]>").append("</promo_amt>"); detailBuff.append("<promo_amt>").append("<![CDATA[0]]>").append("</promo_amt>");
detailBuff.append("<net_amt>").append("<![CDATA[0]]>").append("</net_amt>"); detailBuff.append("<net_amt>").append("<![CDATA["+ orderNetAmount +"]]>").append("</net_amt>");
detailBuff.append("<wf_stat>").append("<![CDATA[]]>").append("</wf_stat>"); detailBuff.append("<wf_stat>").append("<![CDATA[]]>").append("</wf_stat>");
detailBuff.append("<wf_stat_date>").append("<![CDATA[]]>").append("</wf_stat_date>"); detailBuff.append("<wf_stat_date>").append("<![CDATA[]]>").append("</wf_stat_date>");
detailBuff.append("<chg_date>").append("<![CDATA[]]>").append("</chg_date>"); detailBuff.append("<chg_date>").append("<![CDATA[]]>").append("</chg_date>");
detailBuff.append("<chg_user>").append("<![CDATA[]]>").append("</chg_user>"); detailBuff.append("<chg_user>").append("<![CDATA[]]>").append("</chg_user>");
detailBuff.append("<chg_term>").append("<![CDATA[]]>").append("</chg_term>"); detailBuff.append("<chg_term>").append("<![CDATA[]]>").append("</chg_term>");
detailBuff.append("<ecm_type>").append("<![CDATA["+ requestData.getString("ecm_type") +"]]>").append("</ecm_type>");
detailBuff.append("</Detail1>"); detailBuff.append("</Detail1>");
return detailBuff.toString(); return detailBuff.toString();
...@@ -444,7 +503,7 @@ public class ECMOrderDAO { ...@@ -444,7 +503,7 @@ public class ECMOrderDAO {
return billAddress; return billAddress;
} }
private String getDetail2XML(String objName, Map<String, String> cartMap, String cacheName) throws ITMException, BaseException, Exception private String getDetail2XML(String objName,JSONObject requestData, Map<String, String> cartMap, String cacheName) throws ITMException, BaseException, Exception
{ {
StringBuffer detailBuff = new StringBuffer(); StringBuffer detailBuff = new StringBuffer();
System.out.println("getDetail2XML" + cartMap); System.out.println("getDetail2XML" + cartMap);
...@@ -452,22 +511,35 @@ public class ECMOrderDAO { ...@@ -452,22 +511,35 @@ public class ECMOrderDAO {
List<String > keySet=new ArrayList<String>( cartMap.keySet()); List<String > keySet=new ArrayList<String>( cartMap.keySet());
System.out.println("cartMap.keySet()" + keySet); System.out.println("cartMap.keySet()" + keySet);
int idx = 0; int idx = 0;
for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
String itemCode = (String) iterator.next(); JSONArray orderedItems = new JSONArray();
orderedItems=requestData.getJSONArray("orderedItems");
int quantity=0;
System.out.println("cartMap.keySet() getDetail1XML orderedItems" + orderedItems);
for(int i = 0; i < orderedItems.length(); i++){
JSONObject jsonObj = orderedItems.getJSONObject(i);
String itemCode = jsonObj.getString("itemCode");
System.out.println("cartMap.keySet() getDetail1XML itemQuantity" + itemCode);
String lineNo = (idx+1) + ""; String lineNo = (idx+1) + "";
String quantity = cartMap.get(itemCode); quantity = jsonObj.getInt("itemQuantity");
double netAmount ;
ItemDetails itemDetail = productCache.getCachedItemDetail(itemCode, cacheName); ItemDetails itemDetail = productCache.getCachedItemDetail(itemCode, cacheName);
if( itemDetail == null ) if( itemDetail == null )
{ {
productDAO.prepareItemDetails(cacheName, siteCode, itemCode); productDAO.prepareItemDetails(cacheName, siteCode, itemCode);
itemDetail = productCache.getCachedItemDetail(itemCode, cacheName); itemDetail = productCache.getCachedItemDetail(itemCode, cacheName);
} }
JSONObject itemHeader = new JSONObject(itemDetail.getItemHeader()); JSONObject itemHeader = new JSONObject(itemDetail.getItemHeader());
System.out.println("item_Detail in getDetail2XML itemHeader[" + itemHeader + "]"); //rate=itemHeader.getDouble("itemCostRate") * quantity;
System.out.println("item_Dail in getDetail2XML itemHeader[" +itemHeader.getString("itemDiscountedRate") + "]"); netAmount=itemHeader.getDouble("itemDiscountedRate") * quantity;
System.out.println("item_Detail in getDetail2XML[" + itemCode + "]" + itemDetail); //discount=rate - netAmount;
System.out.println("item_code[" + idx + "]" + itemCode); System.out.println("itemHeader.getDouble(itemCostRate) in detail2 [" + itemHeader.getDouble("itemCostRate") +"] and discountrate [" + itemHeader.getDouble("itemDiscountedRate") +"]");
System.out.println("item_Detail in getDetail2XML netAmount[" + netAmount + "]");
System.out.println("item_Detail in getDetail2XML quantity[" + quantity + "]");
System.out.println("item_Detail in getDetail2XML index [" +idx +"] itemCode[" + itemCode + "] itemDetail : [" + itemDetail +"] ");
detailBuff.append("<Detail2 dbID=\"\" domID=\"" + lineNo + "\" objContext=\"2\" objName=\"" + objName + "\" >"); detailBuff.append("<Detail2 dbID=\"\" domID=\"" + lineNo + "\" objContext=\"2\" objName=\"" + objName + "\" >");
detailBuff.append("<attribute pkNames=\"\" selected=\"N\" status=\"N\" updateFlag=\"A\" />"); detailBuff.append("<attribute pkNames=\"\" selected=\"N\" status=\"N\" updateFlag=\"A\" />");
...@@ -476,22 +548,26 @@ public class ECMOrderDAO { ...@@ -476,22 +548,26 @@ public class ECMOrderDAO {
detailBuff.append("<line_no>").append("<![CDATA[" + lineNo + "]]>").append("</line_no>"); detailBuff.append("<line_no>").append("<![CDATA[" + lineNo + "]]>").append("</line_no>");
detailBuff.append("<promo_code>").append("<![CDATA[]]>").append("</promo_code>"); detailBuff.append("<promo_code>").append("<![CDATA[]]>").append("</promo_code>");
detailBuff.append("<quantity>").append("<![CDATA[" + quantity + "]]>").append("</quantity>"); detailBuff.append("<quantity>").append("<![CDATA[" + quantity + "]]>").append("</quantity>");
detailBuff.append("<rate>").append("<![CDATA[0]]>").append("</rate>"); detailBuff.append("<rate>").append("<![CDATA[" + itemHeader.getDouble("itemCostRate") + "]]>").append("</rate>");
detailBuff.append("<disc_perc>").append("<![CDATA[" + itemHeader.getString("itemDiscountedRate") + "]]>").append("</disc_perc>"); detailBuff.append("<disc_perc>").append("<![CDATA[" + itemHeader.getDouble("itemDiscount") + "]]>").append("</disc_perc>");
detailBuff.append("<tax_amt>").append("<![CDATA[0]]>").append("</tax_amt>"); detailBuff.append("<tax_amt>").append("<![CDATA[0]]>").append("</tax_amt>");
detailBuff.append("<tax_chap>").append("<![CDATA[]]>").append("</tax_chap>"); detailBuff.append("<tax_chap>").append("<![CDATA[]]>").append("</tax_chap>");
detailBuff.append("<tax_class>").append("<![CDATA[]]>").append("</tax_class>"); detailBuff.append("<tax_class>").append("<![CDATA[]]>").append("</tax_class>");
detailBuff.append("<tax_env>").append("<![CDATA[]]>").append("</tax_env>"); detailBuff.append("<tax_env>").append("<![CDATA[]]>").append("</tax_env>");
detailBuff.append("<net_amt>").append("<![CDATA[0]]>").append("</net_amt>"); detailBuff.append("<net_amt>").append("<![CDATA[" + netAmount + "]]>").append("</net_amt>");
detailBuff.append("<ord_stat>").append("<![CDATA[]]>").append("</ord_stat>"); detailBuff.append("<ord_stat>").append("<![CDATA[]]>").append("</ord_stat>");
detailBuff.append("<stat_date>").append("<![CDATA[" + genericUtility.getValidDateString(new Date(), genericUtility.getApplDateFormat() ) + "]]>").append("</stat_date>"); detailBuff.append("<stat_date>").append("<![CDATA[" + genericUtility.getValidDateString(new Date(), genericUtility.getApplDateFormat() ) + "]]>").append("</stat_date>");
detailBuff.append("<stat_remarks>").append("<![CDATA[]]>").append("</stat_remarks>"); detailBuff.append("<stat_remarks>").append("<![CDATA[]]>").append("</stat_remarks>");
detailBuff.append("<stat_date>").append("<![CDATA[" + genericUtility.getValidDateString(new Date(), genericUtility.getApplDateFormat() ) + "]]>").append("</stat_date>");
detailBuff.append("<stat_remarks>").append("<![CDATA[]]>").append("</stat_remarks>");
detailBuff.append("<ship_date>").append("<![CDATA[]]>").append("</ship_date>");
detailBuff.append("<dlv_date>").append("<![CDATA[]]>").append("</dlv_date>");
detailBuff.append("</Detail2>"); detailBuff.append("</Detail2>");
idx++; idx++;
} }
return detailBuff.toString(); return detailBuff.toString();
} }
} }
......
ecm/webitm-ecm/trunk/proteus-ecm/proteus/ecm/hibernate/dao/ProductDAO.java
View file @ bc7370bd
...@@ -454,6 +454,10 @@ public class ProductDAO { ...@@ -454,6 +454,10 @@ public class ProductDAO {
// 1. Get Session object // 1. Get Session object
Session session = HibernateUtil.getSessionFactory(siteTranDB).openSession(); Session session = HibernateUtil.getSessionFactory(siteTranDB).openSession();
System.out.println("product cache item code:["+itemCode+"]");
itemCode = itemCode.trim();
System.out.println("product cache item code trim:["+itemCode+"]");
// 2. Create Query // 2. Create Query
Query query = session.createQuery("FROM ECMItemRating WHERE siteCode = '" + siteCode + "' AND itemCode = '" + itemCode + "' "); Query query = session.createQuery("FROM ECMItemRating WHERE siteCode = '" + siteCode + "' AND itemCode = '" + itemCode + "' ");
......
ecm/webitm-ecm/trunk/proteus-ecm/proteus/ecm/hibernate/dao/UserActivityDAO.java
View file @ bc7370bd
...@@ -173,9 +173,9 @@ public class UserActivityDAO { ...@@ -173,9 +173,9 @@ public class UserActivityDAO {
{ {
// 1. Get Session object // 1. Get Session object
Session session = HibernateUtil.getSessionFactory(siteTranDB).openSession(); Session session = HibernateUtil.getSessionFactory(siteTranDB).openSession();
session.beginTransaction(); Transaction tx = session.beginTransaction(); //chitra
session.delete(userData); session.delete(userData);
session.getTransaction().commit(); tx.commit();
session.close(); session.close();
} }
catch (HibernateException e) catch (HibernateException e)
...@@ -198,7 +198,7 @@ public class UserActivityDAO { ...@@ -198,7 +198,7 @@ public class UserActivityDAO {
} }
String flag = "EDIT"; String flag = "EDIT";
userId = String.format("%-10s", userId); userId = String.format("%-10s", userId);
itemCode = String.format("%-10s", itemCode);
ECMUserActivity userData = fetchDataByActivityType(userId, siteCode, activityType, itemCode); ECMUserActivity userData = fetchDataByActivityType(userId, siteCode, activityType, itemCode);
if (userData == null) if (userData == null)
...@@ -230,7 +230,7 @@ public class UserActivityDAO { ...@@ -230,7 +230,7 @@ public class UserActivityDAO {
try try
{ {
userId = String.format("%-10s", userId); userId = String.format("%-10s", userId);
itemCode = String.format("%-10s", itemCode);
ECMUserActivity userData = fetchDataByActivityType(userId, siteCode, activityType, itemCode); ECMUserActivity userData = fetchDataByActivityType(userId, siteCode, activityType, itemCode);
userData.setUserId(userId); userData.setUserId(userId);
userData.setSiteCode(siteCode); userData.setSiteCode(siteCode);
...@@ -588,9 +588,9 @@ public class UserActivityDAO { ...@@ -588,9 +588,9 @@ public class UserActivityDAO {
userAddress = (EntityAddress) userAddressList.get(0); userAddress = (EntityAddress) userAddressList.get(0);
} }
session.beginTransaction(); Transaction tx = session.beginTransaction(); //chitra
session.delete(userAddress); session.delete(userAddress);
session.getTransaction().commit(); tx.commit();
session.close(); session.close();
} catch (HibernateException e) { } catch (HibernateException e) {
System.out.println("HibernateException :"); System.out.println("HibernateException :");
...@@ -806,9 +806,9 @@ public class UserActivityDAO { ...@@ -806,9 +806,9 @@ public class UserActivityDAO {
userCard = userCardList.get(0); userCard = userCardList.get(0);
} }
session.beginTransaction(); Transaction tx = session.beginTransaction(); //f
session.delete(userCard); session.delete(userCard);
session.getTransaction().commit(); tx.commit();
session.close(); session.close();
} }
catch (HibernateException e) catch (HibernateException e)
...@@ -825,9 +825,9 @@ public class UserActivityDAO { ...@@ -825,9 +825,9 @@ public class UserActivityDAO {
{ {
// 1. Get Session object // 1. Get Session object
Session session = HibernateUtil.getSessionFactory(siteTranDB).openSession(); Session session = HibernateUtil.getSessionFactory(siteTranDB).openSession();
session.beginTransaction(); Transaction tx = session.beginTransaction(); //chitra
session.delete(userReview); session.delete(userReview);
session.getTransaction().commit(); tx.commit();
session.close(); session.close();
} }
catch (HibernateException e) catch (HibernateException e)
......
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