WebSVN – SmartDukaan – Diff – /trunk/Support/src/main/java/in/shop2020/support/controllers/SnapdealListController.java

     private String minPosTpVoi;
     private String transferPriceVOI;
     private String serviceTaxVOI;
     private String courierCostVoi;
     private String commissionVoi;
+    private String courierCostMarketplaceVoi;
+    private String commissionRateVoi;
     public String courierCostMarketplace() {
         return courierCostMarketplace;
+    }
         	snapdealItem.setMinimumPossibleTpVoi(Double.parseDouble(minPosTpVoi));
         	snapdealItem.setCourierCostVoi(Double.parseDouble(courierCostVoi));
         	snapdealItem.setCommissionVoi(Double.parseDouble(commissionVoi));
         	snapdealItem.setServiceTaxVoi(Double.parseDouble(serviceTaxVOI));
         	snapdealItem.setTransferPriceVoi(Double.parseDouble(transferPriceVOI));
+        	snapdealItem.setCourierCostMarketplaceVoi(Double.parseDouble(courierCostMarketplaceVoi));
+        	snapdealItem.setCommissionPercentageVoi(Double.parseDouble(commissionRateVoi));
+        }
         MarketplaceItems t_mpItem = updateMarketplaceItemDetails(mpItem);
         //double vat = catalogClientProd.getVatPercentageForItem(Long.valueOf(itemId), warehouse.getStateId(), Double.valueOf(sellingPrice));
         //t_mpItem.setVat(vat);
         t_mpItem.setCourierCostMarketplace(Double.valueOf(courierCostMarketplace));
         snapdealItem.setUpdatedBy(getUserName());
         snapdealItem.setMarketplaceItems(t_mpItem);
+        if(snapdealItem.isIsListedOnSnapdeal()){
-        if(!compareParameters(t_mpItem,snapdealItem,warehouse,item.getWeight(),item.getCategory())){
+	        if(!compareParameters(t_mpItem,snapdealItem,warehouse,item.getWeight(),item.getCategory())){
-            setComparsionResult("0");
+	            setComparsionResult("0");
-            return "snapdeal-update-result";
+	            return "snapdeal-update-result";
+	        }
+	        else{
+	            setComparsionResult("1");
+	        }
         }
+        if(snapdealItem.isIsVoiListed()){
+        	if(!compareParametersVOI(t_mpItem,snapdealItem,warehouse,item.getWeight(),item.getCategory())){
+	            setComparsionResult("0");
+	            return "snapdeal-update-result";
+	        }
-        else{
+	        else{
-            setComparsionResult("1");
+	            setComparsionResult("1");
+	        }
+        }
         if(!catalogClient.addOrUpdateSnapdealItem(snapdealItem)){
             throw new CatalogServiceException();
+        }
+    }
     public boolean compareParametersVOI(MarketplaceItems mpItem,SnapdealItem snapdealItem, Warehouse warehouse,double weight, Long categoryId) throws TException, JSONException, CatalogServiceException{
     	double nlc =getNlcForWarehouse(snapdealItem.getWarehouseId(),snapdealItem.getItem_id());
-    	double courierCostMp = getCourierCostVOI(weight);
+    	double courierCostMp = snapdealItem.getCourierCostMarketplaceVoi();
         double vat = (snapdealItem.getVoiSellingPrice()/(1+(mpItem.getVat()/100))-(nlc/(1+(mpItem.getVat()/100))))*(mpItem.getVat()/100);
         double inHouseCost = mpItem.getPackagingCost()+vat+(mpItem.getReturnProvision()/100)*snapdealItem.getVoiSellingPrice()+mpItem.getOtherCost();
         double lowest_possible_tp = nlc+inHouseCost;
-        double our_tp =  snapdealItem.getVoiSellingPrice()- snapdealItem.getVoiSellingPrice()*((mpItem.getCommission()/100)+mpItem.getEmiFee()/100)*(1+(mpItem.getServiceTax()/100))-(courierCostMp+mpItem.getClosingFee())*(1+(Double.parseDouble(serviceTaxVOI)/100))-(Math.max(20,(mpItem.getPgFee()/100)*snapdealItem.getVoiSellingPrice())*(1+(Double.parseDouble(serviceTaxVOI)/100)));
+        double our_tp =  snapdealItem.getVoiSellingPrice()- snapdealItem.getVoiSellingPrice()*((mpItem.getCommission()/100)+mpItem.getEmiFee()/100)*(1+(mpItem.getServiceTax()/100))-(courierCostMp+mpItem.getClosingFee())*(1+(mpItem.getServiceTax()/100))-(Math.max(20,(mpItem.getPgFee()/100)*snapdealItem.getVoiSellingPrice())*(1+(mpItem.getServiceTax()/100)));
         double commission=0.0;
         if ((mpItem.getPgFee()/100)*snapdealItem.getVoiSellingPrice()>=20){
-            commission =  (((mpItem.getCommission()/100)+mpItem.getPgFee()/100)*snapdealItem.getVoiSellingPrice());
+            commission =  (((snapdealItem.getCommissionPercentageVoi()/100)+mpItem.getPgFee()/100)*snapdealItem.getVoiSellingPrice());
+        }
         else{
-            commission =  ((mpItem.getCommission()/100)*snapdealItem.getVoiSellingPrice()+20);
+            commission =  ((snapdealItem.getCommissionPercentageVoi()/100)*snapdealItem.getVoiSellingPrice()+20);
+        }
-        double service_tax = (Double.parseDouble(serviceTaxVOI)/100)*(snapdealItem.getCommission()+courierCostMp);
+        double service_tax = (mpItem.getServiceTax()/100)*(snapdealItem.getCommission()+courierCostMp);
         double lowest_possible_sp = 0.0;
         if ((mpItem.getPgFee()/100)*snapdealItem.getVoiSellingPrice()>=20){
-            lowest_possible_sp = (nlc+(courierCostMp+mpItem.getClosingFee())*(1+(Double.parseDouble(serviceTaxVOI)/100))*(1+(mpItem.getVat()/100))+(mpItem.getPackagingCost()+mpItem.getOtherCost())*(1+(mpItem.getVat())/100))/(1-((mpItem.getCommission()/100)+mpItem.getEmiFee()/100+mpItem.getPgFee()/100)*(1+(Double.parseDouble(serviceTaxVOI)/100))*(1+(mpItem.getVat())/100)-(mpItem.getReturnProvision()/100)*(1+(mpItem.getVat())/100));
+            lowest_possible_sp = (nlc+(courierCostMp+mpItem.getClosingFee())*(1+(mpItem.getServiceTax()/100))*(1+(mpItem.getVat()/100))+(mpItem.getPackagingCost()+mpItem.getOtherCost())*(1+(mpItem.getVat())/100))/(1-((snapdealItem.getCommissionPercentageVoi()/100)+mpItem.getEmiFee()/100+mpItem.getPgFee()/100)*(1+(mpItem.getServiceTax()/100))*(1+(mpItem.getVat())/100)-(mpItem.getReturnProvision()/100)*(1+(mpItem.getVat())/100));
+        }
         else{
-            lowest_possible_sp = (nlc+(courierCostMp+mpItem.getClosingFee()+20)*(1+(Double.parseDouble(serviceTaxVOI)/100))*(1+(mpItem.getVat()/100))+(mpItem.getPackagingCost()+mpItem.getOtherCost())*(1+(mpItem.getVat())/100))/(1-((mpItem.getCommission()/100)+mpItem.getEmiFee()/100)*(1+(Double.parseDouble(serviceTaxVOI)/100))*(1+(mpItem.getVat())/100)-(mpItem.getReturnProvision()/100)*(1+(mpItem.getVat())/100));
+            lowest_possible_sp = (nlc+(courierCostMp+mpItem.getClosingFee()+20)*(1+(mpItem.getServiceTax()/100))*(1+(mpItem.getVat()/100))+(mpItem.getPackagingCost()+mpItem.getOtherCost())*(1+(mpItem.getVat())/100))/(1-((snapdealItem.getCommissionPercentageVoi()/100)+mpItem.getEmiFee()/100)*(1+(mpItem.getServiceTax()/100))*(1+(mpItem.getVat())/100)-(mpItem.getReturnProvision()/100)*(1+(mpItem.getVat())/100));
+        }
         double vat_rate_prod = getVatRateForItem(warehouse,snapdealItem.getVoiSellingPrice(),snapdealItem.getItem_id());
         JSONObject x = new JSONObject();
         x.put("NLC", nlc);
         x.put("VAT", vat);
-        x.put("COURIER COST",getCourierCost(weight));
+        x.put("COURIER COST",getCourierCostVOI(weight));
         x.put("LOWEST POS TP", lowest_possible_tp);
         x.put("TP", our_tp);
         x.put("COMMISSION", commission);
         x.put("SERVICE TAX", service_tax);
         x.put("LOWEST POS SP", lowest_possible_sp);
         	snapdealItem.setMinimumPossibleTpVoi(Double.parseDouble(minPosTpVoi));
         	snapdealItem.setCourierCostVoi(Double.parseDouble(courierCostVoi));
         	snapdealItem.setCommissionVoi(Double.parseDouble(commissionVoi));
         	snapdealItem.setServiceTaxVoi(Double.parseDouble(serviceTaxVOI));
         	snapdealItem.setTransferPriceVoi(Double.parseDouble(transferPriceVOI));
+        	snapdealItem.setCourierCostMarketplaceVoi(Double.parseDouble(courierCostMarketplaceVoi));
+        	snapdealItem.setCommissionPercentageVoi(Double.parseDouble(commissionRateVoi));
+        }
         MarketplaceItems mpItem = new MarketplaceItems();
         MarketplaceItems t_mpItem = updateMarketplaceItemDetails(mpItem);
         /*double vat = catalogClientProd.getVatPercentageForItem(Long.valueOf(itemId), warehouse.getStateId(), Double.valueOf(sellingPrice));
         t_mpItem.setEmiFee(mpCosting.getEmiFee());
         t_mpItem.setClosingFee(mpCosting.getClosingFee());
         t_mpItem.setPgFee(mpCosting.getPgFee());
         t_mpItem.setCourierCostMarketplace(Double.valueOf(courierCostMarketplace));
         t_mpItem.setPackagingCost(Double.valueOf(packagingCost));
+        if(snapdealItem.isIsListedOnSnapdeal()){
-        if(!compareParameters(t_mpItem,snapdealItem,warehouse,item.getWeight(),item.getCategory())){
+	        if(!compareParameters(t_mpItem,snapdealItem,warehouse,item.getWeight(),item.getCategory())){
-            setComparsionResult("0");
+	            setComparsionResult("0");
-            return "snapdeal-update-result";
+	            return "snapdeal-update-result";
+	        }
+	        else{
+	            setComparsionResult("1");
+	        }
         }
+        if(snapdealItem.isIsVoiListed()){
+        	if(!compareParametersVOI(t_mpItem,snapdealItem,warehouse,item.getWeight(),item.getCategory())){
+	            setComparsionResult("0");
+	            return "snapdeal-update-result";
+	        }
-        else{
+	        else{
-            setComparsionResult("1");
+	            setComparsionResult("1");
+	        }
+        }
         snapdealItem.setMarketplaceItems(t_mpItem);
         Long timestamp = System.currentTimeMillis();
         boolean result = catalogClient.addOrUpdateSnapdealItem(snapdealItem);
         if(!result){
 	public void setCommissionVoi(String commissionVoi) {
 		this.commissionVoi = commissionVoi;
+	}
+	public String getCourierCostMarketplaceVoi() {
+		return courierCostMarketplaceVoi;
+	}
+	public void setCourierCostMarketplaceVoi(String courierCostMarketplaceVoi) {
+		this.courierCostMarketplaceVoi = courierCostMarketplaceVoi;
+	}
+	public String getCommissionRateVoi() {
+		return commissionRateVoi;
+	}
+	public void setCommissionRateVoi(String commissionRateVoi) {
+		this.commissionRateVoi = commissionRateVoi;
+	}
+}

Subversion Repositories SmartDukaan

(root)/trunk/Support/src/main/java/in/shop2020/support/controllers/SnapdealListController.java – Rev 14780 → 14862