|
@@ -29,22 +29,23 @@ public class EulaTransaction implements AppManagerFunction {
|
|
|
String ret = null;
|
|
String ret = null;
|
|
|
String key = syntax.get("key");
|
|
String key = syntax.get("key");
|
|
|
String token = syntax.get("token");
|
|
String token = syntax.get("token");
|
|
|
- Message msg = null;
|
|
|
|
|
|
|
+ Message msg = Messanger.getMessage(MessageId.SYSTEM_BUSY, msisdn, "<refid>", refid);
|
|
|
try {
|
|
try {
|
|
|
McomSubscriber originator = McomSubscriber.getMcomSubscriber(msisdn);
|
|
McomSubscriber originator = McomSubscriber.getMcomSubscriber(msisdn);
|
|
|
|
|
|
|
|
if (!originator.isSubscribed()) {
|
|
if (!originator.isSubscribed()) {
|
|
|
msg = Messanger.getMessage(MessageId.UNAUTHORISED_ERROR, originator);
|
|
msg = Messanger.getMessage(MessageId.UNAUTHORISED_ERROR, originator);
|
|
|
|
|
+ return new Message(0,0,"FAILED:" + msg.getMessage().toString());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if (!"ACTIVE".equalsIgnoreCase(originator.getProperty("STATUS"))) {
|
|
if (!"ACTIVE".equalsIgnoreCase(originator.getProperty("STATUS"))) {
|
|
|
msg = Messanger.getMessage(MessageId.INACTIVE_ERROR, originator);
|
|
msg = Messanger.getMessage(MessageId.INACTIVE_ERROR, originator);
|
|
|
|
|
+ return new Message(0,0,"FAILED:" + msg.getMessage().toString());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
msg = TransactionHelper.allowedTransaction(originator, key);
|
|
msg = TransactionHelper.allowedTransaction(originator, key);
|
|
|
if (msg != null) {
|
|
if (msg != null) {
|
|
|
- return msg;
|
|
|
|
|
|
|
+ return new Message(0,0,"FAILED:" + msg.getMessage().toString());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
DbWrapper.getInstance().QueryUpdate("UPDATE TBLMOBILEACCOUNTINFO SET TOKEN = ? WHERE MSISDN = ? ", new Object[] {token, originator.getMsisdn() });
|
|
DbWrapper.getInstance().QueryUpdate("UPDATE TBLMOBILEACCOUNTINFO SET TOKEN = ? WHERE MSISDN = ? ", new Object[] {token, originator.getMsisdn() });
|
|
@@ -83,7 +84,7 @@ public class EulaTransaction implements AppManagerFunction {
|
|
|
log.error("Eula Error|Ref:"+refid +"|",e);
|
|
log.error("Eula Error|Ref:"+refid +"|",e);
|
|
|
msg = Messanger.getMessage(MessageId.SYSTEM_BUSY);
|
|
msg = Messanger.getMessage(MessageId.SYSTEM_BUSY);
|
|
|
}
|
|
}
|
|
|
- return msg;
|
|
|
|
|
|
|
+ return new Message(0,0,"FAILED:" + msg.getMessage().toString());
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|