WebSVN – SmartDukaan – Diff – /RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/ConfirmController.java

 package in.shop2020.recharge.controllers;
 import in.shop2020.model.v1.order.FRC;
+import in.shop2020.model.v1.order.PayMethod;
 import in.shop2020.model.v1.order.RechargePlan;
 import in.shop2020.model.v1.order.RechargeTransaction;
 import in.shop2020.model.v1.order.RechargeType;
 import in.shop2020.model.v1.order.TelecomCircle;
 import in.shop2020.thrift.clients.TransactionClient;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
 import javax.servlet.http.HttpServletRequest;
 import org.apache.log4j.Logger;
 import org.apache.struts2.convention.annotation.Result;
 import org.apache.struts2.convention.annotation.Results;
 @Results({
     @Result(name="recharge-redirect", type="redirectAction", params = {"actionName" , "home", "errorMsg", "${errorMessage}"}),
-    @Result(name="recharge-result", type="redirectAction", params = {"actionName" , "recharge-result", "rechargeId", "${rechargeOrderId}"})
+    @Result(name="recharge-result", type="redirectAction", params = {"actionName" , "recharge-result", "rechargeId", "${rechargeOrderId}", "paymentAmount", "${paymentAmount}"})
 })
 public class ConfirmController extends BaseController{
     /**
+     *
      */
     private static final long serialVersionUID = 1L;
     private long rechargeOrderId = 0;
     private String amount = "";
+    private long paymentAmount = 0;
+	private int payMethod = 0;
-    private String number = "";
+	private String number = "";
     private String email = "";
     private String rechargeType = "";
     private String deviceType = "";
     private String mobileOperator = "";
     private String dthOperator = "";
             rechargeOrder.setDeviceType(RechargeType.findByValue((int) Long.parseLong(deviceType)));
             rechargeOrder.setName(name);
             rechargeOrder.setIsFrc(Long.parseLong(rechargeType) == 1 ? false : true);
             rechargeOrder.setCafNum(cafNum);
             rechargeOrder.setSimNum(simNum);
+            rechargeOrder.setPayMethod(PayMethod.findByValue(payMethod));
             if(deviceType.equals("1")) {
                 rechargeOrder.setOperatorId(Long.parseLong(mobileOperator));
             } else if (deviceType.equals("2")) {
                 rechargeOrder.setOperatorId(Long.parseLong(dthOperator));
+            }
-            rechargeOrder.setPaymentAmount(Long.parseLong(amount) - Long.parseLong(discount));
+            this.paymentAmount = Long.parseLong(amount) - Long.parseLong(discount);
+            rechargeOrder.setPaymentAmount(this.paymentAmount);
             Long circleId = 0l;
             if(circlecode != null && !circlecode.equals("")) {
                 TransactionClient tcl1 = new TransactionClient();
                 TelecomCircle circle = tcl1.getClient().getTelecomCircle(-1, circlecode);
                 if(circle != null) {
             if(rechargeOrder.isIsFrc()) {
                 for (FRC frc : tcl.getClient().getFRCs(circleId, rechargeOrder.getOperatorId())) {
                     if(frc.getDenomination() == rechargeOrder.getAmount()) {
                         if(frc.getMaxDiscount() < Long.parseLong(discount)) {
                             errorMessage = "MaxDiscount : " + frc.getMaxDiscount() + " is less than discount amount entered";
-                            log.warn("MaxDiscount : " + frc.getMaxDiscount() + " is less than discount amount entered");
+                            log.warn("You cannot avail discount more than Rs." + frc.getMaxDiscount());
                             return "recharge-redirect";
                         } else {
                             rechargeOrder.setDiscount(Double.parseDouble(discount));
+                        }
+                    }
+            }
             if (number.length() != 10) {
                 return "Number should be of 10 digits";
+            }
-        } else {
+        } else if (payMethod != 1 || payMethod != 2){
-            log.warn("Invalid rechargeType : " + deviceType);
+            log.warn("Missing paymethod or invalid");
-            return "Oops! There seems to be a problem. Please try after some time";
+            return "Please select paymethod";
+        }
         if (mobileOperator == null || mobileOperator == "") {
             log.warn("Invalid operator : " + mobileOperator);
             return "Oops! There seems to be a problem. Please try after some time";
+    }
     public void setDthnumber(String dthnumber) {
         this.number = dthnumber;
+    }
+    public int getPayMethod() {
+    	return payMethod;
+    }
+    public long getPaymentAmount() {
+    	return paymentAmount;
+    }
+    public void setPayMethod(int payMethod) {
+    	this.payMethod = payMethod;
+    }
     public String getEmail() {
         return email;
+    }
     public String getCirclecode() {
         return circlecode;
+    }
+}

Subversion Repositories SmartDukaan

(root)/RechargeDashboard/src/main/java/in/shop2020/recharge/controllers/ConfirmController.java – Rev 7138 → 7139