WebSVN – SmartDukaan – Diff – /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java

 package com.spice.profitmandi.web.controller;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletRequest;
+import javax.swing.SortOrder;
 import org.apache.thrift.TException;
 import org.apache.thrift.transport.TTransportException;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
-import org.apache.logging.log4j.LogManager;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
+import com.spice.profitmandi.common.enumuration.RechargeStatus;
+import com.spice.profitmandi.common.enumuration.SchemeType;
 import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
+import com.spice.profitmandi.common.model.CustomPaymentOption;
+import com.spice.profitmandi.common.model.OperatorType;
 import com.spice.profitmandi.common.model.ProfitMandiConstants;
+import com.spice.profitmandi.common.model.RechargeCredential;
+import com.spice.profitmandi.common.model.RechargeRequest;
+import com.spice.profitmandi.common.model.RechargeResponse;
 import com.spice.profitmandi.common.util.Utils;
 import com.spice.profitmandi.common.web.util.ResponseSender;
+import com.spice.profitmandi.dao.entity.dtr.RechargeCommission;
+import com.spice.profitmandi.dao.entity.dtr.RechargeOperator;
+import com.spice.profitmandi.dao.entity.dtr.RechargeProvider;
+import com.spice.profitmandi.dao.entity.dtr.RechargeTransaction;
 import com.spice.profitmandi.dao.entity.dtr.User;
 import com.spice.profitmandi.dao.entity.dtr.UserAccount;
 import com.spice.profitmandi.dao.enumuration.dtr.AccountType;
+import com.spice.profitmandi.dao.enumuration.dtr.RechargeType;
+import com.spice.profitmandi.dao.repository.GenericRepository;
+import com.spice.profitmandi.dao.repository.dtr.RechargeCommissionRepository;
+import com.spice.profitmandi.dao.repository.dtr.RechargeOperatorRepository;
+import com.spice.profitmandi.dao.repository.dtr.RechargeProviderRepository;
+import com.spice.profitmandi.dao.repository.dtr.RechargeTransactionRepository;
 import com.spice.profitmandi.dao.repository.dtr.UserAccountRepository;
 import com.spice.profitmandi.dao.repository.dtr.UserRepository;
 import com.spice.profitmandi.dao.repository.transaction.PendingRechargeCommissionRepository;
+import com.spice.profitmandi.dao.repository.transaction.UserWalletRepository;
+import com.spice.profitmandi.service.recharge.RechargeService;
 import com.spice.profitmandi.thrift.clients.PaymentClient;
 import com.spice.profitmandi.thrift.clients.TransactionClient;
 import com.spice.profitmandi.web.req.CreateRechargeRequest;
 import com.spice.profitmandi.web.res.ConfirmRechargeResponse;
 import com.spice.profitmandi.web.res.CreateRechargeResponse;
 import com.spice.profitmandi.web.res.MyRechargesResponse;
 import com.spice.profitmandi.web.res.RechargeResultPojo;
+import com.spice.profitmandi.dao.entity.transaction.UserWallet;
 import in.shop2020.model.v1.order.DenominationType;
 import in.shop2020.model.v1.order.DeviceNumberInfo;
 import in.shop2020.model.v1.order.OrderType;
 import in.shop2020.model.v1.order.RechargeDenomination;
 import in.shop2020.model.v1.order.RechargeOrder;
 import in.shop2020.model.v1.order.RechargeOrderStatus;
-import in.shop2020.model.v1.order.RechargeType;
 import in.shop2020.model.v1.order.TransactionServiceException;
-import in.shop2020.model.v1.order.UserWallet;
 import in.shop2020.payments.Payment;
 import in.shop2020.payments.PaymentException;
 import in.shop2020.payments.PaymentStatus;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 @Controller
 @Transactional(rollbackFor=Throwable.class)
 public class RechargeController {
-	private static final Logger log=LogManager.getLogger(RechargeController.class);
+	private static final Logger log=LoggerFactory.getLogger(RechargeController.class);
 	private static final String HEADER_X_FORWARDED_FOR = "X-FORWARDED-FOR";
 	private static final String X_REAL_IP = "X-Real-IP";
+	@Value("${oxigen.recharge.transaction.url}")
+	private String oxigenRechargeTransactionUrl;
+	@Value("${oxigen.recharge.enquiry.url}")
+	private String oxigenRechargeEnquiryUrl;
+	@Value("${oxigen.recharge.auth.key}")
+	private String oxigenRechargeAuthKey;
+	@Value("${oxigen.recharge.validation.url}")
+	private String oxigenRechargeValidationUrl;
+	@Value("${oxigen.recharge.validation.auth.key}")
+	private String oxigenRechargeValidationAuthKey;
+	@Value("${think.walnut.digital.recharge.transaction.mobile.url}")
+	private String thinkWalnutDigitalRechargeTransactionMobileUrl;
+	@Value("${think.walnut.digital.recharge.transaction.mobile.username}")
+	private String thinkWalnutDigitalRechargeTransactionMobileUserName;
+	@Value("${think.walnut.digital.recharge.transaction.mobile.password}")
+	private String thinkWalnutDigitalRechargeTransactionMobilePassword;
+	@Value("${think.walnut.digital.recharge.transaction.dth.url}")
+	private String thinkWalnutDigitalRechargeTransactionDthUrl;
+	@Value("${think.walnut.digital.recharge.transaction.dth.username}")
+	private String thinkWalnutDigitalRechargeTransactionDthUserName;
+	@Value("${think.walnut.digital.recharge.transaction.dth.password}")
+	private String thinkWalnutDigitalRechargeTransactionDthPassword;
+	@Value("${think.walnut.digital.recharge.enquiry.url}")
+	private String thinkWalnutDigitalRechargeEnquiryUrl;
+	@Value("${think.walnut.digital.recharge.enquiry.username}")
+	private String thinkWalnutDigitalRechargeEnquiryUserName;
+	@Value("${think.walnut.digital.recharge.enquiry.password}")
+	private String thinkWalnutDigitalRechargeEnquiryPassword;
+	@Value("${think.walnut.digital.recharge.auth.key}")
+	private String thinkWalnutDigitalRechargeAuthKey;
+	@Autowired
+	UserWalletRepository userWalletRepository;
+	@Autowired
+	private GenericRepository genericRepository;
+	@Autowired
+	private RechargeCommissionRepository rechargeCommissionRepository;
 	@Autowired
 	private UserAccountRepository userAccountRepository;
+	@Autowired
+	private RechargeTransactionRepository rechargeTransactionRepository;
 	@Autowired
+	private RechargeProviderRepository rechargeProviderRepository;
+	@Autowired
 	private UserRepository userRepository;
 	@Autowired
+	private RechargeOperatorRepository rechargeOperatorRepository;
+	@Autowired
+	private RechargeService rechargeService;
+	@Autowired
 	private PendingRechargeCommissionRepository pendingRechargeCommissionRepository;
 	@Autowired
 	private ResponseSender<?> responseSender;
+	private RechargeCredential rechargeTransactionMobileCredential;
+	private RechargeCredential rechargeTransactionDthCredential;
+	private RechargeCredential thinkWalnutDigitalRechargeEnquiryCredential;
 	@RequestMapping(value = ProfitMandiConstants.URL_GET_SERVICE_PROVIDER, method=RequestMethod.POST,produces = MediaType.APPLICATION_JSON_VALUE)
 	@ApiImplicitParams({
 		@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token",
 				required = true, dataType = "string", paramType = "header")
 	public ResponseEntity<?> getServiceProvider(HttpServletRequest request, @RequestParam(value="deviceNumber") String deviceNumber, @RequestParam(value="rechargeType") String rechargeType){
 		DeviceNumberInfo deviceInfo = null;
 		TransactionClient tcl;
 		try {
 			tcl = new TransactionClient();
-			deviceInfo = tcl.getClient().getServiceProviderForDevice(RechargeType.valueOf(rechargeType), deviceNumber.substring(0,4));
+			//deviceInfo = tcl.getClient().getServiceProviderForDevice(RechargeType.valueOf(rechargeType), deviceNumber.substring(0,4));
 		} catch (Exception e) {
 			log.error("Unable to get service provider for Device number " + deviceNumber + " and rechargeType : " +  rechargeType, e);
+		}
 		return responseSender.ok(deviceInfo);
+	}
 			log.error("Unable to get rechargeDenominations for operatorId " + operatorId + " and circleCode : " +  circleCode + " and DenominationType : " + denominationType, e);
+		}
 		return responseSender.ok(rechargeDenominations);
+	}
-	@RequestMapping(value = ProfitMandiConstants.URL_MOBILE_OPERATORS, method=RequestMethod.POST,produces = MediaType.APPLICATION_JSON_VALUE)
+	@RequestMapping(value = ProfitMandiConstants.URL_MOBILE_OPERATORS, method=RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE)
 	@ApiImplicitParams({
 		@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token",
 				required = true, dataType = "string", paramType = "header")
 	})
 	@ApiOperation(value = "")
-	public ResponseEntity<?> getAllMobileOperators(HttpServletRequest request){
+	public ResponseEntity<?> getAllMobileOperators(HttpServletRequest request,@RequestParam(name = ProfitMandiConstants.OPERATOR_TYPE) OperatorType operatorType){
-		Map<Long, String> mobileProviderMap = Utils.getMobileProvidersMap();
+		Map<Integer, String> mobileProviderMap = new HashMap<>();
+		List<RechargeOperator> rechargeOperators = rechargeOperatorRepository.selectAllByOperatorType(operatorType);
+	//	List<RechargeOperator> rechargeOperators = rechargeOperatorRepository.selectAllByRechargeType(RechargeType.MOBILE);
+		for(RechargeOperator rechargeOperator : rechargeOperators) {
+		mobileProviderMap.put(rechargeOperator.getId(), rechargeOperator.getName());
+	    }
 		return responseSender.ok(mobileProviderMap);
+	}
 	@RequestMapping(value = ProfitMandiConstants.URL_DTH_OPERATORS, method=RequestMethod.POST,produces = MediaType.APPLICATION_JSON_VALUE)
 	@ApiImplicitParams({
 		@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token",
 				required = true, dataType = "string", paramType = "header")
 	})
 	@ApiOperation(value = "")
 	public ResponseEntity<?> getAllDTHOperators(HttpServletRequest request){
-		Map<Long, String> dthProviderMap = Utils.getDthProvidersMap();
+		Map<Integer, String> dthProviderMap = new HashMap<>();
+		List<RechargeOperator> dthOperators = rechargeOperatorRepository.selectAllByRechargeType(RechargeType.DTH);
+		for(RechargeOperator dthOperator : dthOperators) {
+			dthProviderMap.put(dthOperator.getId(), dthOperator.getName());
+		}
 		return responseSender.ok(dthProviderMap);
+	}
 	@RequestMapping(value = ProfitMandiConstants.URL_RECHARGE_CONFIRM, method=RequestMethod.POST,produces = MediaType.APPLICATION_JSON_VALUE)
 	@ApiImplicitParams({
 		@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token",
 		userAccount = userAccountRepository.selectByUserIdType(userId, AccountType.saholic);
 		try {
 			TransactionClient tc = new TransactionClient();
-			wallet = tc.getClient().getUserWallet(Long.valueOf(userAccount.getAccountKey()));
+			//wallet = tc.getClient().getUserWallet(Long.valueOf(userAccount.getAccountKey()));
 		} catch (NumberFormatException | TException e) {
 			return responseSender.internalServerError(e);
+		}
 		ConfirmRechargeResponse crr = new ConfirmRechargeResponse();
-		crr.setWalletAmount(wallet.getAmount());
+		//crr.setWalletAmount(wallet.getAmount());
 		crr.setWalletAmountLeft(wallet.getAmount() - rechargeAmount);
 		crr.setCanProceed(true);
 		if (crr.getWalletAmountLeft() < 0){
 			crr.setCanProceed(false);
 			crr.setReason("You don't have sufficient wallet balance");
 		throws ProfitMandiBusinessException{
 		int userId = (int)request.getAttribute(ProfitMandiConstants.USER_ID);
 		int retailerId = userAccountRepository.selectRetailerIdByUserId(userId);
 		return responseSender.ok(pendingRechargeCommissionRepository.selectByRetailerId(retailerId));
+	}
+	private RechargeRequest convertRechargeRequest (CreateRechargeRequest createRechargeRequest ){
+		RechargeRequest rr= new RechargeRequest();
+		rr.setAmount(createRechargeRequest.getRechargeAmount());
+		rr.setOperatorId((int) createRechargeRequest.getOperatorId());
+		rr.setOperatorType(createRechargeRequest.getPlan());
+		rr.setReferenceNumber(createRechargeRequest.getNumber());
+		rr.setRechargeType(createRechargeRequest.getRechargeType());
+		Set<CustomPaymentOption> pp = new LinkedHashSet<>();
+		CustomPaymentOption cpo = new CustomPaymentOption();
+		cpo.setPaymentOption("cash");
+		cpo.setPaymentOptionId(1);
+		cpo.setAmount(createRechargeRequest.getRechargeAmount());
+		pp.add(cpo);
+		rr.setPaymentOptions(pp);
+	    return rr;
+	}
 	@RequestMapping(value = ProfitMandiConstants.URL_CREATE_RECHARGE , method=RequestMethod.POST,produces = MediaType.APPLICATION_JSON_VALUE)
 	@ApiImplicitParams({
 		@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token",
 				required = true, dataType = "string", paramType = "header")
 	})
+	@PostConstruct
+	private void setRechargeCredentials() {
+		rechargeTransactionMobileCredential = new RechargeCredential();
+		rechargeTransactionMobileCredential.setRechargeUrl(thinkWalnutDigitalRechargeTransactionMobileUrl);
+		rechargeTransactionMobileCredential.setRechargeUserName(thinkWalnutDigitalRechargeTransactionMobileUserName);
+		rechargeTransactionMobileCredential.setRechargePassword(thinkWalnutDigitalRechargeTransactionMobilePassword);
+		rechargeTransactionMobileCredential.setRechargeAuthKey(thinkWalnutDigitalRechargeAuthKey);
+		rechargeTransactionDthCredential = new RechargeCredential();
+		rechargeTransactionDthCredential.setRechargeUrl(thinkWalnutDigitalRechargeTransactionDthUrl);
+		rechargeTransactionDthCredential.setRechargeUserName(thinkWalnutDigitalRechargeTransactionDthUserName);
+		rechargeTransactionDthCredential.setRechargePassword(thinkWalnutDigitalRechargeTransactionDthPassword);
+		rechargeTransactionDthCredential.setRechargeAuthKey(thinkWalnutDigitalRechargeAuthKey);
+	}
 	public ResponseEntity<?> createRecharge(HttpServletRequest request, @RequestBody CreateRechargeRequest createRechargeRequest)
 		throws ProfitMandiBusinessException{
+		int userId = (int)request.getAttribute(ProfitMandiConstants.USER_ID);
+		int retailerId = userAccountRepository.selectRetailerIdByUserId(userId);
 		String ipAddress  = remoteAddr(request);
-		String errorMessage = validateRecharge(RechargeType.valueOf(createRechargeRequest.getRechargeType()), createRechargeRequest.getNumber(), createRechargeRequest.getOperatorId(), ipAddress);
-		CreateRechargeResponse crr =  new CreateRechargeResponse();
+	    CreateRechargeResponse crr =  new CreateRechargeResponse();
-		if(!errorMessage.equals("SUCCESS")){
-			crr.setReason(errorMessage);
-			crr.setResult(false);
-			return responseSender.badRequest(crr);
-		}
-		int userId = (int)request.getAttribute("userId");
-		UserAccount userAccount = null;
+	    UserAccount userAccount = null;
-		UserWallet wallet = null;
+	    UserWallet wallet = null;
+		wallet = userWalletRepository.selectByRetailerId(retailerId);
 		if (createRechargeRequest.getRechargeAmount() <=0){
 			crr.setReason("Illegal recharge amount");
 			crr.setResult(false);
 			return responseSender.badRequest(crr);
+		}
-		userAccount = userAccountRepository.selectByUserIdType(userId, AccountType.saholic);
-		try {
-			TransactionClient tc = new TransactionClient();
-			wallet = tc.getClient().getUserWallet(Long.valueOf(userAccount.getAccountKey()));
-		} catch (NumberFormatException | TException e) {
-			log.error("Unable to get user wallet ",e);
-			crr.setReason("We are experiencing some problem right now.");
-			crr.setResult(false);
-			return responseSender.internalServerError(e);
-		}
 		if (wallet.getAmount() < createRechargeRequest.getRechargeAmount()){
 			crr.setReason("You don't have sufficient wallet balance.");
 			crr.setResult(false);
 			return responseSender.badRequest(crr);
+		}
 			crr.setReason("We are experiencing some problem right now.");
 			crr.setResult(false);
 			return responseSender.internalServerError(e);
+		}
+		RechargeRequest rechargeRequest = convertRechargeRequest(createRechargeRequest);
-		RechargeOrder t_rechargeOrder = new RechargeOrder();
-		t_rechargeOrder.setTotalAmount(createRechargeRequest.getRechargeAmount());
-		t_rechargeOrder.setUserEmailId(user.getEmailId());
-		t_rechargeOrder.setUserId(Long.valueOf(userAccount.getAccountKey()));
-		t_rechargeOrder.setDeviceNumber(createRechargeRequest.getNumber());
-		t_rechargeOrder.setPlan(createRechargeRequest.getPlan()==null?"":createRechargeRequest.getPlan());
+		RechargeResponse rechargeResponse = rechargeService.doRecharge(oxigenRechargeTransactionUrl, oxigenRechargeAuthKey, oxigenRechargeValidationUrl,
-		t_rechargeOrder.setOperatorId(createRechargeRequest.getOperatorId());
-		t_rechargeOrder.setRechargeType(RechargeType.valueOf(createRechargeRequest.getRechargeType()));
+				oxigenRechargeValidationAuthKey, rechargeTransactionMobileCredential, rechargeTransactionDthCredential, retailerId, rechargeRequest);
-		t_rechargeOrder.setStatus(RechargeOrderStatus.PAYMENT_PENDING);
-		t_rechargeOrder.setOrderType(OrderType.B2C);
-		t_rechargeOrder.setWalletAmount(createRechargeRequest.getRechargeAmount());
-		t_rechargeOrder.setCouponAmount(0);
-		t_rechargeOrder.setCouponCode("");
-		t_rechargeOrder.setIpAddress(ipAddress);
-		TransactionClient tc = null;
-		RechargeOrder rechargeOrder;
-		try {
-			tc = new TransactionClient();
-			rechargeOrder = tc.getClient().createRechargeOrder(t_rechargeOrder);
+		crr.setResult(rechargeResponse.getStatus().equals(RechargeStatus.SUCCESS));
-		} catch (TransactionServiceException | TException e) {
-			log.error("Unable to create recharge order",e);
-			crr.setReason("We are experiencing some problem right now.");
+		crr.setRequestId(rechargeResponse.getRequestId());
-			crr.setResult(false);
-			return responseSender.internalServerError(e);
-		}
-		log.info("Recharge Order:" + rechargeOrder);
+		if(RechargeType.valueOf(rechargeRequest.getRechargeType()) == RechargeType.MOBILE) {
-		PaymentClient paymentServiceClient = null;
+		 return responseSender.ok(crr);
-		try {
+		}else {
-			paymentServiceClient = new PaymentClient();
-		} catch (TTransportException e) {
-			log.error("Unable to create payment client",e);
-			crr.setReason("We are experiencing some problem right now.");
-			crr.setResult(false);
-			return responseSender.internalServerError(e);
+			 return responseSender.ok(crr);
+		}
-		try {
+	}
-			RechargeOrder d_rechargeOrder = tc.getClient().getRechargeOrder(rechargeOrder.getId());
-			List<Payment> payments = paymentServiceClient.getClient().getPaymentForRechargeTxnId(d_rechargeOrder.getTransactionId());
+	@RequestMapping(value = ProfitMandiConstants.URL_RECHARGE_SUMMARY , method=RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE)
-			if(payments.size() > 0) {
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token",
-				throw new PaymentException(d_rechargeOrder.getId(), "Payment already exists for recharge");
+				required = true, dataType = "string", paramType = "header")
-			}
+	})
-			Long merchantPaymentId = 0l;
+	public ResponseEntity<?>rechargeSummary (HttpServletRequest request ,@RequestParam(name = ProfitMandiConstants.RECHARGE_TYPE) String rechargeTypeString, @RequestParam(name = "offset", defaultValue = "0") int offset, @RequestParam(name = "limit", defaultValue = "10") int limit)
-			if (d_rechargeOrder.getWalletAmount() +  d_rechargeOrder.getCouponAmount() != d_rechargeOrder.getTotalAmount()) {
+		throws ProfitMandiBusinessException{
-				log.error("Wallet amount : " + d_rechargeOrder.getWalletAmount() + ", coupon amount : " + d_rechargeOrder.getCouponAmount() + " and total amount : " + d_rechargeOrder.getTotalAmount());
-				merchantPaymentId = paymentServiceClient.getClient().createPayment(d_rechargeOrder.getUserId(), d_rechargeOrder.getTotalAmount(), 8, d_rechargeOrder.getTransactionId(), true);
+		int userId = (int)request.getAttribute(ProfitMandiConstants.USER_ID);
-				paymentServiceClient.getClient().updatePaymentDetails(merchantPaymentId, "","", "0", "", "", "", "", "", PaymentStatus.FAILED, "", null);
+		int retailerId = userAccountRepository.selectRetailerIdByUserId(userId);
-				tc.getClient().updateRechargeOrderStatus(d_rechargeOrder.getId(),  RechargeOrderStatus.PAYMENT_FAILED);
+		RechargeType rechargeType = RechargeType.valueOf(rechargeTypeString);
-			} else {
-				merchantPaymentId = paymentServiceClient.getClient().createPayment(d_rechargeOrder.getUserId(), d_rechargeOrder.getTotalAmount(), 8, d_rechargeOrder.getTransactionId(), true);
+		List<RechargeTransaction> rechargeTransactions =rechargeTransactionRepository.selectAllByRetailerIdAndType(retailerId, rechargeType, offset, limit);
-				//Update payment status as authorized
+		for (RechargeTransaction rechargeTransaction : rechargeTransactions) {
-				paymentServiceClient.getClient().updatePaymentDetails(merchantPaymentId, "","", "0", "", "", "", "", "", PaymentStatus.SUCCESS, "", null);
+			 String operatorName=rechargeOperatorRepository.selectById(rechargeTransaction.getOperatorId()).getName();
-				tc.getClient().updateRechargeOrderStatus(d_rechargeOrder.getId(),  RechargeOrderStatus.PAYMENT_SUCCESSFUL);
+			rechargeTransaction.setOperatorName(operatorName);
-			}
+		}
-			crr.setRechargeOrderId(d_rechargeOrder.getId());
+		if(RechargeType.valueOf(rechargeTypeString) == RechargeType.MOBILE) {
-			crr.setResult(true);
-		} catch (Exception e) {
-			log.error("Unable to mark the payment as authorized", e);
+			return responseSender.ok(rechargeTransactions);
-			crr.setReason("We are experiencing some problem right now.");
-			crr.setResult(false);
+		}else {
-			return responseSender.internalServerError(e);
+			return responseSender.ok(rechargeTransactions);
+		}
-		return responseSender.ok(crr);
+	}
+	@RequestMapping(value = ProfitMandiConstants.URL_RECHARGE_COMMISSIONS , method=RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE)
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token",
+				required = true, dataType = "string", paramType = "header")
+	})
+	public ResponseEntity<?>rechargeCommissions (HttpServletRequest request,@RequestParam(name = "offset", defaultValue = "0") int offset, @RequestParam(name = "limit", defaultValue = "60") int limit)
+		throws ProfitMandiBusinessException{
+		List<RechargeCommission> rechargeCommissions = rechargeCommissionRepository.selectAllPaginated(offset, limit);
+		for (RechargeCommission rechargeCommission : rechargeCommissions) {
+			 String operatorName=rechargeOperatorRepository.selectById(rechargeCommission.getOperatorId()).getName();
+			 RechargeType rechargeType=rechargeOperatorRepository.selectById(rechargeCommission.getOperatorId()).getRechargeType();
+			 OperatorType operatorType=rechargeOperatorRepository.selectById(rechargeCommission.getOperatorId()).getOperatorType();
+			 rechargeCommission.setOperatorName(operatorName);
+			 rechargeCommission.setRechargeType(rechargeType);
+			 rechargeCommission.setOperatorType(operatorType);
+		}
+		Map<Integer,RechargeCommission> commissionMap = rechargeCommissions.stream().collect(Collectors.groupingBy(RechargeCommission::getOperatorId, Collectors.collectingAndThen(
+				Collectors.reducing((RechargeCommission d1,RechargeCommission d2) -> d1.getAmount() > d2.getAmount() ? d1 : d2),
+				               Optional::get)));
+		return responseSender.ok(commissionMap.values());
+	}
 	@RequestMapping(value = ProfitMandiConstants.URL_RECHARGE_RESULT , method=RequestMethod.POST,produces = MediaType.APPLICATION_JSON_VALUE)
 	@ApiImplicitParams({
 		@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token",
 				required = true, dataType = "string", paramType = "header")
 	})
+	@PostConstruct
+	private void setRechargeEnquiryCredentials() {
+		thinkWalnutDigitalRechargeEnquiryCredential = new RechargeCredential();
+		thinkWalnutDigitalRechargeEnquiryCredential.setRechargeUrl(thinkWalnutDigitalRechargeEnquiryUrl);
+		thinkWalnutDigitalRechargeEnquiryCredential.setRechargeUserName(thinkWalnutDigitalRechargeEnquiryUserName);
+		thinkWalnutDigitalRechargeEnquiryCredential.setRechargePassword(thinkWalnutDigitalRechargeEnquiryPassword);
+		thinkWalnutDigitalRechargeEnquiryCredential.setRechargeAuthKey(thinkWalnutDigitalRechargeAuthKey);
+	}
-	public ResponseEntity<?> rechargeResult(HttpServletRequest request, @RequestParam(value="rechargeOrderId") long rechargeOrderId){
+	public ResponseEntity<?> rechargeResult(HttpServletRequest request, @RequestParam(value="requestId") String requestId ) throws ProfitMandiBusinessException{
-		TransactionClient tc=null;
 		RechargeOrder rechargeOrder = null;
 		RechargeResultPojo rrp = null;
+		//RechargeResponse rr =  new RechargeResponse();
+		//String requestId = rr.getRequestId();
+		int userId = (int)request.getAttribute(ProfitMandiConstants.USER_ID);
+	    int retailerId = userAccountRepository.selectRetailerIdByUserId(userId);
+		RechargeResponse rechargeResponse = rechargeService.checkStatus(oxigenRechargeEnquiryUrl, oxigenRechargeAuthKey, thinkWalnutDigitalRechargeEnquiryCredential,retailerId , requestId);
+		return responseSender.ok(rechargeResponse);
-		try {
+		/* try {
 			tc = new TransactionClient();
-			rechargeOrder = tc.getClient().getRechargeOrder(rechargeOrderId);
+			//rechargeOrder = tc.getClient().getRechargeOrder(rechargeOrderId);
 		} catch (TransactionServiceException | TException e) {
 			// return with internal server error
 			e.printStackTrace();
 			rrp = new RechargeResultPojo();
 			rrp.setIsError(true);
 		rrp.setIsError(Boolean.parseBoolean(os[0]));
 		rrp.setRechargeStatus(os[1]);
 		rrp.setDetailDisplayMessage(os[2]);
 		if (rechargeOrder.getStatus().equals(RechargeOrderStatus.RECHARGE_UNKNOWN)){
 			rrp.setPoll(true);
+		}*/
-		}
-		return responseSender.ok(rrp);
+	}
 	@RequestMapping(value = ProfitMandiConstants.URL_POLL_RECHARGE , method=RequestMethod.POST,produces = MediaType.APPLICATION_JSON_VALUE)
 	@ApiImplicitParams({
 		@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token",
 			return responseSender.internalServerError(e);
+		}
 		List<MyRechargesResponse> myRechargesList = new ArrayList<MyRechargesResponse>();
 		for (RechargeOrder rechargeOrder : rechargeOrders){
 			MyRechargesResponse rp = new MyRechargesResponse();
-			if(rechargeOrder.getRechargeType() == RechargeType.MOBILE){
+		/*	if(rechargeOrder.getRechargeType() == RechargeType.MOBILE){
         		rp.setOperator(Utils.getProvider(rechargeOrder.getOperatorId()));
         		rp.setOperatorType("MOBILE");
+        	}
         	if(rechargeOrder.getRechargeType() == RechargeType.DTH){
         		rp.setOperator(Utils.getProvider(rechargeOrder.getOperatorId()));
         		rp.setOperatorType("DTH");
-        	}
+        	}*/
         	rp.setOrderId(rechargeOrder.getId());
         	rp.setOperatorId(rechargeOrder.getOperatorId());
         	rp.setDate(rechargeOrder.getCreationTimestamp());
         	rp.setNumber(rechargeOrder.getDeviceNumber());
         	rp.setAmount(rechargeOrder.getTotalAmount());
 			log.info("Value of remoteAddr is [{}]", remoteAddr);
+		}
 		return remoteAddr;
+	}
-	private String validateRecharge(RechargeType rechargeType, String number, long operatorId, String ipAddress){
+	/*private String validateRecharge(RechargeType rechargeType, String number, long operatorId, String ipAddress){
 		TransactionClient tcl;
 		try {
 			tcl = new TransactionClient();
-			String result = tcl.getClient().validateRecharge(rechargeType, number, operatorId, ipAddress);
+		//	String result = tcl.getClient().validateRecharge(rechargeType, number, operatorId, ipAddress);
-			log.info("validateRecharge Called" + number + " and rechargeType : " +  rechargeType + ", IP:" + ipAddress + ", Operator:" + operatorId + ", Result:" + result);
+			//log.info("validateRecharge Called" + number + " and rechargeType : " +  rechargeType + ", IP:" + ipAddress + ", Operator:" + operatorId + ", Result:" + result);
-			return result;
+			//return result;
 		} catch (Exception e) {
 			log.error("Unable to get service provider for Device number " + number + " and rechargeType : " +  rechargeType, e);
+		}
 		return "Oops! There seems to be a problem. Please try after some time";
-	}
+	}*/
+}

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java – Rev 23568 → 23585