Przeglądaj źródła

Add Get OCS Packages

Sherwin 7 lat temu
rodzic
commit
ab91a56795

+ 2 - 4
GabonTelMobicashMobileAppHelper/src/com/psi/gabontel/mobileapp/helper/GetMobileAppMsisdnDetails.java

@@ -22,11 +22,9 @@ public class GetMobileAppMsisdnDetails implements AppManagerFunction  {
 	
 
 	@Override
-	public AppMessage manageTransaction(String refid, String msisdn, String message, Map<String, String> syntax) {
-		// TODO Auto-generated method stub
-		String key      = syntax.get("key");
-		String  detailkey = syntax.get("detailkey");
+	public AppMessage manageTransaction(String refid, String msisdn, String message, Map<String, String> syntax) {	
 		
+		String  detailkey = syntax.get("externaldata");	
 		return new Message(0, 0,  MsisdnDetails.get(msisdn, detailkey));
 		
 	}

+ 22 - 26
GabonTelMobicashMobileAppHelper/src/com/psi/gabontel/mobileapp/helper/GetOcsPackages.java

@@ -22,42 +22,38 @@ import com.psi.gabontel.mobileapp.helper.objects.OcsPackages.Package;
 @Stateless
 @Remote(AppManagerFunction.class)
 public class GetOcsPackages implements AppManagerFunction {
-	
+
 	private static final Logger log = Logger.getLogger(GetOcsPackages.class);
+
 	@Override
 	public String processTransaction(String refid, String msisdn, String message, Map<String, String> syntax) {
 		return manageTransaction(refid, msisdn, message, syntax).getMessage();
 	}
-	
+
 	@Override
 	public AppMessage manageTransaction(String refid, String msisdn, String message, Map<String, String> syntax) {
-		// TODO Auto-generated method stub
-		String key      = syntax.get("key");
-		String  detailkey = syntax.get("detailkey");
-		
+
 		try {
-			
-	
-		 LinkedHashMap<String,ArrayList<Package>> jsondata = null;
-		 if(msisdn.startsWith("24105")) {
-			 jsondata =  OcsPackages.getPackages().get("MOOV");
-		 }else if(msisdn.startsWith("24106")) {			 
-			 jsondata =  OcsPackages.getPackages().get("LIBERTIES");
-		 }
-		
-		 StringWriter out = new StringWriter();
-		 JSONValue.writeJSONString(jsondata, out);
-		 out.toString();
-		 
-		return new Message(0, 0,  out.toString());
-		}catch (Exception e) {
-			log.error("Awts Error",e);
+
+			LinkedHashMap<String, ArrayList<Package>> jsondata = null;
+			if (msisdn.startsWith("24105")) {
+				jsondata = OcsPackages.getPackages().get("MOOV");
+			} else if (msisdn.startsWith("24106")) {
+				jsondata = OcsPackages.getPackages().get("LIBERTIES");
+			}
+
+			StringWriter out = new StringWriter();
+			JSONValue.writeJSONString(jsondata, out);
+			out.toString();
+
+			return new Message(0, 0, out.toString());
+		} catch (Exception e) {
+			log.error("Awts Error", e);
 			// TODO: handle exception
 		}
-		
-		return new Message(0, 0,  "{}");
-		
+
+		return new Message(0, 0, "{}");
+
 	}
 
-	
 }

+ 1 - 1
GabonTelMobicashMobileAppHelper/src/com/psi/gabontel/mobileapp/helper/objects/OcsPackages.java

@@ -26,7 +26,7 @@ public class OcsPackages {
 	static {
 		packages = new LinkedHashMap<String,LinkedHashMap<String,ArrayList<Package>>>();
 		
-		DataRowCollection rows = db.QueryDataRows("SELECT BUNDLEID,BUNDLENAME,PRICEFR,DESCRIPTION FROM TBLAIRBUNDLE WHERE STATUS = 1 AND (BUNDLENAME LIKE 'L%' OR BUNDLENAME LIKE 'M%') ");
+		DataRowCollection rows = db.QueryDataRows("SELECT BUNDLEID,BUNDLENAME,PRICEFR / 100 as PRICEFR ,DESCRIPTION FROM TBLAIRBUNDLE WHERE STATUS = 1 AND (BUNDLENAME LIKE 'L%' OR BUNDLENAME LIKE 'M%') ORDER BY BUNDLENAME ASC,PRICEFR ASC ");
 		
 		Iterator<DataRow> iterator = rows.iterator();
 		while(iterator.hasNext()) {