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

 package in.shop2020.support.controllers;
+import in.shop2020.config.ConfigException;
 import in.shop2020.model.v1.catalog.CatalogService.Client;
 import in.shop2020.model.v1.catalog.CatalogServiceException;
 import in.shop2020.model.v1.catalog.Item;
 import in.shop2020.model.v1.catalog.MarketplaceItems;
 import in.shop2020.model.v1.catalog.MarketplacePercentage;
 import in.shop2020.support.utils.ReportsUtils;
 import in.shop2020.support.utils.UpdateSDPricingUsingPanel;
 import in.shop2020.thrift.clients.CatalogClient;
 import in.shop2020.thrift.clients.InventoryClient;
 import in.shop2020.thrift.clients.TransactionClient;
+import in.shop2020.thrift.clients.config.ConfigClient;
 import in.shop2020.utils.GmailUtils;
 import javax.mail.MessagingException;
 import java.io.BufferedInputStream;
 import java.io.File;
 	private String minPosTp;
 	private String vat;
 	private String comparsionResult;
 	private String maxSp;
 	private String nDaySale;
+	private static String live;
 	public String getnDaySale() {
 		return nDaySale;
+	}
+	}
 	public void setSdItemCode(String sdItemCode) {
 		this.sdItemCode = sdItemCode;
+	}
+	static{
+		try {
+			live = ConfigClient.getClient().get("sync_price_on_marketplace");
+			logger.info("Update_price_on_mp"+live);
+		} catch (ConfigException e) {
+		    logger.error("Unable to get parameter from the config service", e);
+		    live = "false";
+		}
+	}
 	public String index() {
 		if (!ReportsUtils.canAccessReport((Long) session.getAttribute(ReportsUtils.ROLE),request.getServletPath())) {
 			return "authfail";
+		}
 		mpItem.setEmiFee(mpCosting.getEmiFee());
 		mpItem.setReturnProvision(mpCosting.getReturnProvision());
 		mpItem.setClosingFee(mpCosting.getClosingFee());
 		mpItem.setServiceTax(mpCosting.getServiceTax());
 		mpItem.setCommission(mpCosting.getCommission());
+		mpItem.setPgFee(mpCosting.getPgFee());
 		InventoryClient inventoryServiceClient = new InventoryClient();
 		in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
 		Warehouse warehouse = inventoryClient.getWarehouse(Long.valueOf(warehouseId));
 		/*if (!(warehouse.getWarehouseType()==WarehouseType.OURS && warehouse.getInventoryType() == InventoryType.GOOD)){
 			throw new InventoryServiceException();
 		if (t_mpItem.getCurrentSp()< t_mpItem.getMinimumPossibleSp()){
 			sendAlert(t_mpItem.getItemId(),t_mpItem.getCurrentSp(),t_mpItem.getMinimumPossibleSp());
+		}
 		logger.info("\nUpdate Method Item Id "+itemId+"\nSelling Price "+sellingPrice+"\nWarehouse Id "+warehouseId+"\nMax Nlc "+maxNlc+"\nUpdated By: "+session.getAttribute(ReportsUtils.USER_NAME).toString());
-		if(oldPrice!=Double.valueOf(sellingPrice)){
+		if(oldPrice!=Double.valueOf(sellingPrice) && Boolean.valueOf(live) && snapdealItem.isSuppressPriceFeed() && snapdealItem.isIsListedOnSnapdeal()){
 			logger.info("Calling Method to update price at snapdeal");
 			UpdateSDPricingUsingPanel updatePriceOnSnapdeal = new UpdateSDPricingUsingPanel(Float.valueOf(sellingPrice),supc,item,timestamp);
 			logger.info("Calling Thread to update price at snapdeal");
 			updatePriceOnSnapdeal.start();
+		}
 		UpdateSDPricingUsingPanel updatePriceOnSnapdeal = new UpdateSDPricingUsingPanel(Float.valueOf(sellingPrice),supc,item,System.currentTimeMillis());
 		logger.info("Calling Thread to update price at snapdeal for auto pricing");
 		updatePriceOnSnapdeal.start();
+	}
 	public boolean compareParameters(MarketplaceItems mpItem, SnapdealItem snapdealItem, Warehouse warehouse,double weight) throws TException, JSONException, CatalogServiceException{
 		double nlc =getNlcForWarehouse(snapdealItem.getWarehouseId(),snapdealItem.getItem_id());
 		double vat = (snapdealItem.getSellingPrice()/(1+(mpItem.getVat()/100))-(nlc/(1+(mpItem.getVat()/100))))*(mpItem.getVat()/100);
 		double inHouseCost = 15+vat+(mpItem.getReturnProvision()/100)*snapdealItem.getSellingPrice()+mpItem.getOtherCost();
 		double lowest_possible_tp = nlc+inHouseCost;
-		double our_tp =  snapdealItem.getSellingPrice()- snapdealItem.getSellingPrice()*(mpItem.getCommission()/100+mpItem.getEmiFee()/100)*(1+(mpItem.getServiceTax()/100))-(snapdealItem.getCourierCost()+mpItem.getClosingFee())*(1+(mpItem.getServiceTax()/100));
+		double our_tp =  snapdealItem.getSellingPrice()- snapdealItem.getSellingPrice()*((mpItem.getCommission()/100)+mpItem.getEmiFee()/100)*(1+(mpItem.getServiceTax()/100))-(snapdealItem.getCourierCost()+mpItem.getClosingFee())*(1+(mpItem.getServiceTax()/100))-(Math.max(20,(mpItem.getPgFee()/100)*snapdealItem.getSellingPrice())*(1+(mpItem.getServiceTax()/100)));
+		double commission=0.0;
+		if ((mpItem.getPgFee()/100)*snapdealItem.getSellingPrice()>=20){
+			commission =  (((mpItem.getCommission()/100)+mpItem.getPgFee()/100)*snapdealItem.getSellingPrice());
+		}
+		else{
-		double commission =  ((mpItem.getCommission()/100)*snapdealItem.getSellingPrice());
+			commission =  ((mpItem.getCommission()/100)*snapdealItem.getSellingPrice()+20);
+		}
 		double service_tax = (mpItem.getServiceTax()/100)*(snapdealItem.getCommission()+snapdealItem.getCourierCost());
-		double lowest_possible_sp = (nlc+(snapdealItem.getCourierCost()+mpItem.getClosingFee())*(1+(mpItem.getServiceTax()/100))*(1+(mpItem.getVat()/100))+(15+mpItem.getOtherCost())*(1+(mpItem.getVat())/100))/(1-(mpItem.getCommission()/100+mpItem.getEmiFee()/100)*(1+(mpItem.getServiceTax()/100))*(1+(mpItem.getVat())/100)-(mpItem.getReturnProvision()/100)*(1+(mpItem.getVat())/100));
+		double lowest_possible_sp = 0.0;
+		if ((mpItem.getPgFee()/100)*snapdealItem.getSellingPrice()>=20){
+			lowest_possible_sp = (nlc+(snapdealItem.getCourierCost()+mpItem.getClosingFee())*(1+(mpItem.getServiceTax()/100))*(1+(mpItem.getVat()/100))+(15+mpItem.getOtherCost())*(1+(mpItem.getVat())/100))/(1-((mpItem.getCommission()/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+(snapdealItem.getCourierCost()+mpItem.getClosingFee()+20)*(1+(mpItem.getServiceTax()/100))*(1+(mpItem.getVat()/100))+(15+mpItem.getOtherCost())*(1+(mpItem.getVat())/100))/(1-((mpItem.getCommission()/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.getSellingPrice(),snapdealItem.getItem_id());
 		JSONObject x = new JSONObject();
 		x.put("NLC", nlc);
 		x.put("VAT", vat);
 		x.put("COURIER COST",getCourierCost(weight));
 		t_mpItem.setCommission(mpCosting.getCommission());
 		t_mpItem.setServiceTax(mpCosting.getServiceTax());
 		t_mpItem.setReturnProvision(mpCosting.getReturnProvision());
 		t_mpItem.setEmiFee(mpCosting.getEmiFee());
 		t_mpItem.setClosingFee(mpCosting.getClosingFee());
+		t_mpItem.setPgFee(mpCosting.getPgFee());
 		if(!compareParameters(t_mpItem,snapdealItem,warehouse,item.getWeight())){
 			setComparsionResult("0");
 			return "snapdeal-update-result";
+		}
 		else{
 			throw new CatalogServiceException();
+		}
 		if (t_mpItem.getCurrentSp()< t_mpItem.getMinimumPossibleSp()){
 			sendAlert(t_mpItem.getItemId(),t_mpItem.getCurrentSp(),t_mpItem.getMinimumPossibleSp());
+		}
+		if (Boolean.valueOf(live) && snapdealItem.isSuppressPriceFeed() && snapdealItem.isIsListedOnSnapdeal()){
-		logger.info("Calling Method to update new item price at snapdeal");
+			logger.info("Calling Method to update new item price at snapdeal");
-		UpdateSDPricingUsingPanel updatePriceOnSnapdeal = new UpdateSDPricingUsingPanel(Float.valueOf(sellingPrice),supc,item,timestamp);
+			UpdateSDPricingUsingPanel updatePriceOnSnapdeal = new UpdateSDPricingUsingPanel(Float.valueOf(sellingPrice),supc,item,timestamp);
-		logger.info("Calling Thread to update new item price at snapdeal");
+			logger.info("Calling Thread to update new item price at snapdeal");
-		updatePriceOnSnapdeal.start();
+			updatePriceOnSnapdeal.start();
+		}
 		return "snapdeal-update-result";
+	}
 	public String getAddNewItemForm(){
 		itemObj.put("CommissionRate", mpCosting.getCommission());
 		itemObj.put("ServiceTaxRate", mpCosting.getServiceTax());
 		itemObj.put("ReturnProvision", mpCosting.getReturnProvision());
 		itemObj.put("EmiFee", mpCosting.getEmiFee());
 		itemObj.put("ClosingFee", mpCosting.getClosingFee());
+		itemObj.put("PgFee", mpCosting.getPgFee());
 		return "item-details-json";
+	}
 	public String ke$ha() throws NumberFormatException, TException, JSONException, InventoryServiceException, CatalogServiceException{
 		Client catalogClientProd = new CatalogClient().getClient();
 				marketplaceItem.setCommission(mpCosting.getCommission());
 				marketplaceItem.setServiceTax(mpCosting.getServiceTax());
 				marketplaceItem.setReturnProvision(mpCosting.getReturnProvision());
 				marketplaceItem.setEmiFee(mpCosting.getEmiFee());
 				marketplaceItem.setClosingFee(mpCosting.getClosingFee());
+				marketplaceItem.setPgFee(mpCosting.getPgFee());
 				try {
 					item = catalogClient.getItem(sku);
 					if (item.getId()==0){
 						sb.append(sku + " Item not valid"+"\n");
+			}
 			warehouse = inventoryClient.getWarehouse(snapdealItem.getWarehouseId());
 			snapdealItem.setCourierCost(courierCost);
 			marketplaceItem.setCourierCost(courierCost);
-			transferPrice = roundTwoDecimals(snapdealItem.getSellingPrice()- snapdealItem.getSellingPrice()*(marketplaceItem.getCommission()/100+marketplaceItem.getEmiFee()/100)*(1+(marketplaceItem.getServiceTax()/100))-(snapdealItem.getCourierCost()+marketplaceItem.getClosingFee())*(1+(marketplaceItem.getServiceTax()/100)));
+			transferPrice = roundTwoDecimals(snapdealItem.getSellingPrice()- snapdealItem.getSellingPrice()*((marketplaceItem.getCommission()/100)+marketplaceItem.getEmiFee()/100)*(1+(marketplaceItem.getServiceTax()/100))-(snapdealItem.getCourierCost()+marketplaceItem.getClosingFee())*(1+(marketplaceItem.getServiceTax()/100))-(Math.max(20,(marketplaceItem.getPgFee()/100)*snapdealItem.getSellingPrice())*(1+(marketplaceItem.getServiceTax()/100))));
 			snapdealItem.setTransferPrice(transferPrice);
 			marketplaceItem.setCurrentTp(transferPrice);
+			if ((marketplaceItem.getPgFee()/100)*snapdealItem.getSellingPrice()>=20){
+				commission =  (((marketplaceItem.getCommission()/100)+marketplaceItem.getPgFee()/100)*snapdealItem.getSellingPrice());
+			}
+			else{
-			commission = roundTwoDecimals(((marketplaceItem.getCommission()/100)*snapdealItem.getSellingPrice()));
+				commission =  ((marketplaceItem.getCommission()/100)*snapdealItem.getSellingPrice()+20);
+			}
+			commission = roundTwoDecimals(commission);
 			snapdealItem.setCommission(commission);
 			serviceTax = roundTwoDecimals((marketplaceItem.getServiceTax()/100)*(snapdealItem.getCommission()+snapdealItem.getCourierCost()));
 			snapdealItem.setServiceTax(serviceTax);
 			double vatRate = catalogClientProd.getVatPercentageForItem(snapdealItem.getItem_id(),warehouse.getStateId(),snapdealItem.getSellingPrice());
 			marketplaceItem.setVat(vatRate);
 			double vat = roundTwoDecimals((snapdealItem.getSellingPrice()/(1+(marketplaceItem.getVat()/100))-(snapdealItem.getMaxNlc()/(1+(marketplaceItem.getVat()/100))))*(marketplaceItem.getVat()/100));
 			double inHouseCost = roundTwoDecimals(15+vat+(marketplaceItem.getReturnProvision()/100)*snapdealItem.getSellingPrice()+marketplaceItem.getOtherCost());
 			double lowest_possible_tp = roundTwoDecimals(snapdealItem.getMaxNlc()+inHouseCost);
 			marketplaceItem.setMinimumPossibleTp(lowest_possible_tp);
+			double lowest_possible_sp=0.0;
+			if ((marketplaceItem.getPgFee()/100)*snapdealItem.getSellingPrice()>=20){
-			double lowest_possible_sp = roundTwoDecimals((snapdealItem.getMaxNlc()+(snapdealItem.getCourierCost()+marketplaceItem.getClosingFee())*(1+marketplaceItem.getServiceTax()/100)*(1+(marketplaceItem.getVat()/100))+(15+marketplaceItem.getOtherCost())*(1+(marketplaceItem.getVat())/100))/(1-(marketplaceItem.getCommission()/100+marketplaceItem.getEmiFee()/100)*(1+(marketplaceItem.getServiceTax()/100))*(1+(marketplaceItem.getVat())/100)-(marketplaceItem.getReturnProvision()/100)*(1+(marketplaceItem.getVat())/100)));
+				lowest_possible_sp = roundTwoDecimals((snapdealItem.getMaxNlc()+(snapdealItem.getCourierCost()+marketplaceItem.getClosingFee())*(1+marketplaceItem.getServiceTax()/100)*(1+(marketplaceItem.getVat()/100))+(15+marketplaceItem.getOtherCost())*(1+(marketplaceItem.getVat())/100))/(1-((marketplaceItem.getCommission()/100)+marketplaceItem.getEmiFee()/100+marketplaceItem.getPgFee()/100)*(1+(marketplaceItem.getServiceTax()/100))*(1+(marketplaceItem.getVat())/100)-(marketplaceItem.getReturnProvision()/100)*(1+(marketplaceItem.getVat())/100)));
+			}
+			else{
+				lowest_possible_sp = roundTwoDecimals((snapdealItem.getMaxNlc()+(snapdealItem.getCourierCost()+marketplaceItem.getClosingFee()+20)*(1+marketplaceItem.getServiceTax()/100)*(1+(marketplaceItem.getVat()/100))+(15+marketplaceItem.getOtherCost())*(1+(marketplaceItem.getVat())/100))/(1-((marketplaceItem.getCommission()/100)+marketplaceItem.getEmiFee()/100)*(1+(marketplaceItem.getServiceTax()/100))*(1+(marketplaceItem.getVat())/100)-(marketplaceItem.getReturnProvision()/100)*(1+(marketplaceItem.getVat())/100)));
+			}
 			marketplaceItem.setMinimumPossibleSp(lowest_possible_sp);
 			snapdealItem.setUpdatedBy(updatedBy);
 			snapdealItem.setMarketplaceItems(marketplaceItem);
 			//logger.info(snapdealItem.toString());
 			if(!catalogClient.addOrUpdateSnapdealItem(snapdealItem)){
 		return name!=null?name:"";
+	}
-}
+}

Subversion Repositories SmartDukaan

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