|
|
@@ -776,6 +776,11 @@ public class KittyFallWs extends WebserviceAbstract {
|
|
|
return response.getErrorCode();
|
|
|
}
|
|
|
if (params.equals("0")) {
|
|
|
+ String processingRoute = resultRequestSpool.isEnabled() ? "SPOOL" : "DIRECT";
|
|
|
+ logger.info("resultRequest routing: route=" + processingRoute
|
|
|
+ + ", transactionId=" + transactionId
|
|
|
+ + ", msisdn=" + msisdn
|
|
|
+ + ", serviceId=" + serviceid);
|
|
|
if (resultRequestSpool.isEnabled()) {
|
|
|
ResultRequestEvent event = ResultRequestEvent.create(reqTime.getTime(),
|
|
|
transactionId, serviceid, msisdn, chargetime, params,
|
|
|
@@ -784,8 +789,11 @@ public class KittyFallWs extends WebserviceAbstract {
|
|
|
logger.info("resultRequest durably queued eventId=" + event.getEventId()
|
|
|
+ ", msisdn=" + msisdn);
|
|
|
} else {
|
|
|
+ logger.info("resultRequest DIRECT processing started: transactionId="
|
|
|
+ + transactionId + ", msisdn=" + msisdn);
|
|
|
renewMps(msisdn, productInfo);
|
|
|
- logger.info("Renew account success (DIRECT): " + msisdn);
|
|
|
+ logger.info("resultRequest DIRECT processing completed: transactionId="
|
|
|
+ + transactionId + ", msisdn=" + msisdn);
|
|
|
}
|
|
|
response.setErrorCode(Common.ErrorCode.SUCCESS);
|
|
|
response.setContent(Common.ResultCode.SUCCESS);
|
|
|
@@ -953,7 +961,7 @@ public class KittyFallWs extends WebserviceAbstract {
|
|
|
String REQ = reqDf.format(new Date()) + "1" + msisdn.substring(Common.COUNTRY_CODE.length());
|
|
|
logger.info("after get product info " + fee);
|
|
|
// right -----------------------------------------------
|
|
|
- resultPaid = ws.requestMpsOtp(msisdn, fee, REQ, productInfo.getProductName());
|
|
|
+// resultPaid = ws.requestMpsOtp(msisdn, fee, REQ, productInfo.getProductName());
|
|
|
|
|
|
String errorCode = resultPaid.split("\\|")[0];
|
|
|
if (WSProcessor.LIST_SUCCESS_RES.contains(resultPaid)) {
|
|
|
@@ -1578,58 +1586,6 @@ public class KittyFallWs extends WebserviceAbstract {
|
|
|
response.setContent(WSProcessor.getMessageFromResult(logger, resultPaid));
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- /*
|
|
|
- msisdn = formatMsisdn(msisdn);
|
|
|
- List<RegisterInfo> listRegInday = db.getRegisterInday(msisdn, packageName);
|
|
|
- if (listRegInday != null && !listRegInday.isEmpty()) {
|
|
|
- response.setErrorCode(Common.ErrorCode.ALREADY_REGISTER);
|
|
|
- response.setContent(MessageResponse.getDefaultMessage(Common.Message.ALREADY_REGISTERED, logger));
|
|
|
- } else {
|
|
|
- // da dang ki (status = 1) nhung he thong chua kip gia han
|
|
|
- ProductInfo productInfo = getProductByName(packageName);
|
|
|
- String resultPaid = "0";
|
|
|
- int fee = (int) productInfo.getFee();
|
|
|
- boolean registered = false;
|
|
|
- if (!db.checkRegistered(msisdn, productInfo.getProductName())) {
|
|
|
- // new user
|
|
|
- fee = 0;
|
|
|
- } else {
|
|
|
- if (listRegInday != null && !listRegInday.isEmpty()) {
|
|
|
- fee = 0;
|
|
|
- registered = true;
|
|
|
- }
|
|
|
- }
|
|
|
- // neu khong co buoc otp thi tao them requestId ban di
|
|
|
- String REQ = reqDf.format(new Date()) + "1" + msisdn.substring(Common.COUNTRY_CODE.length());
|
|
|
- logger.info("after get product info " + fee);
|
|
|
- // right -----------------------------------------------
|
|
|
-// resultPaid = ws.requestMpsOtp(msisdn, fee, REQ, productInfo.getProductName());
|
|
|
-
|
|
|
- String errorCode = resultPaid.split("\\|")[0];
|
|
|
- if (WSProcessor.LIST_SUCCESS_RES.contains(resultPaid)) {
|
|
|
- logger.info("Register success " + msisdn + ", fee " + fee);
|
|
|
-
|
|
|
- // send message
|
|
|
- String message = MessageResponse.get(Common.Message.REGISTER_SUCCESS,
|
|
|
- Common.Message.REGISTER_SUCCESS, logger);
|
|
|
- message = message.replace("%fee%", productInfo.getFee() + "");
|
|
|
- message = message.replace("%spin%", productInfo.getNumberSpin() + "");
|
|
|
-//
|
|
|
-// // check user have registered in the past
|
|
|
-// if (!db.checkRegisteredForTheFirstTime(msisdn, serviceId)) {
|
|
|
-// response.setErrorCode(Common.ErrorCode.SUCCESS_FOR_THE_FIRST_TIME_REGISTER);
|
|
|
-// } else {
|
|
|
-// response.setErrorCode(Common.ErrorCode.SUCCESS);
|
|
|
-// }
|
|
|
- response.setErrorCode(Common.ErrorCode.SUCCESS);
|
|
|
- }
|
|
|
- else {
|
|
|
- response.setErrorCode(WSProcessor.getErrorCodeFromResult(logger, resultPaid));
|
|
|
- response.setContent(WSProcessor.getMessageFromResult(logger, resultPaid));
|
|
|
- }
|
|
|
- }
|
|
|
- */
|
|
|
}
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
@@ -2098,6 +2054,7 @@ public class KittyFallWs extends WebserviceAbstract {
|
|
|
|
|
|
String message = MessageResponse.get(Common.Message.CHARGE_FEE_SUCCESS, logger);
|
|
|
message = message.replace("%fee%", String.valueOf(moneyCharge));
|
|
|
+ message = message.replaceAll("%turn%", productInfo.getNumberSpin() + "");
|
|
|
response.setErrorCode(Common.ErrorCode.SUCCESS);
|
|
|
response.setContent(message);
|
|
|
}
|
|
|
@@ -2334,7 +2291,7 @@ public class KittyFallWs extends WebserviceAbstract {
|
|
|
} else {
|
|
|
|
|
|
int money = Integer.parseInt(fee);
|
|
|
- ws.addMoney(msisdn, money);
|
|
|
+// ws.addMoney(msisdn, money);
|
|
|
|
|
|
ChargeLog chargeLog = new ChargeLog();
|
|
|
chargeLog.setFee(-money);
|
student
