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

     private String autoDecrement;
     private String autoIncrement;
     private String autoFavourite;
     private String manualFavourite;
     private String otherCost;
+    private boolean isFbaPromotionActive;
+    private boolean isFbbPromotionActive;
+    private String fbaPromoPrice;
+    private String fbbPromoPrice;
+    private String promoItemId;
     public String getOtherCost() {
         return otherCost;
+    }
+    }
     public Amazonlisted fetchItemDetail() throws NumberFormatException, TException {
         Client CatalogClient = new CatalogClient("catalog_service_server_host_amazon","catalog_service_server_port").getClient();
+        long now = getTimeInMilliseconds();
-        return CatalogClient.getAmazonItemDetails(Long.valueOf(id));
+        Amazonlisted amazonItemDetails = CatalogClient.getAmazonItemDetails(Long.valueOf(id));
+        return amazonItemDetails;
+    }
     public Item getSaholicItem(String id) throws NumberFormatException, CatalogServiceException, TException {
         Client CatalogClient = new CatalogClient("catalog_service_server_host_amazon","catalog_service_server_port").getClient();
         return CatalogClient.getItem(Long.valueOf(id));
             logger.info("Nothing new to commit");
+        }
         return "index";
+    }
+    public String updatePromo() throws NumberFormatException, TException{
+        Client catalogClient = new CatalogClient("catalog_service_server_host_amazon","catalog_service_server_port").getClient();
+        Amazonlisted amazonlisted = catalogClient.getAmazonItemDetails(Long.valueOf(promoItemId));
+        if(Boolean.valueOf(isFbaPromotionActive)){
+            amazonlisted.setFbaPromoPrice(Double.valueOf(fbaPromoPrice));
+        }
+        if(Boolean.valueOf(isFbbPromotionActive)){
+            amazonlisted.setFbbPromoPrice(Double.valueOf(fbbPromoPrice));
+        }
+        catalogClient.updateAmazonItemDetails(amazonlisted);
+        return "index";
+    }
     public void upload() throws IOException, TException {
         File fileToCreate = new File("/tmp/", "Amazon-shipping.xls");
         FileUtils.copyFile(this.file, fileToCreate);
         FileInputStream iFile = new FileInputStream(new File(file.getAbsolutePath()));
+        }
         TransactionClient tcl = new TransactionClient();
         tcl.getClient().updateTimestampForAmazonOrder(amazonOrderMap);
+    }
-    public void uploadPromotionSheet() throws IOException, ParseException, TException, CatalogServiceException{
+    public void uploadPromotionSheet() throws IOException, ParseException, TException, CatalogServiceException, InterruptedException{
         Map<String,AmazonPromotion> amazonPromoMap = new HashMap<String,AmazonPromotion>();
         SimpleDateFormat dateFormatter;
+        long timeNow = Long.valueOf(getTimeInMilliseconds());
         if (promotionType.equalsIgnoreCase("SHORTTERM")){
             dateFormatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        }
         else{
             dateFormatter = new SimpleDateFormat("yyyy-MM-dd");
+        }
-        File fileToCreate = new File("/tmp/", "Amazon-Promotion-"+String.valueOf(getTimeInMilliseconds())+".xls");
+        File fileToCreate = new File("/tmp/", "Amazon-Promotion-"+String.valueOf(getTimeInMilliseconds()));
         FileUtils.copyFile(this.file, fileToCreate);
         BufferedReader reader = null;
         try {
             reader = new BufferedReader(new FileReader(file.getAbsolutePath()));
         } catch (FileNotFoundException e1) {
         while ((str = reader.readLine()) != null) {
             lineNumber++;
             if (str.trim().length() == 0 || lineNumber<2) {
                 continue;
+            }
+            timeNow +=1500;
             String[] values = str.split("\t");
             AmazonPromotion amazonPromotion = new AmazonPromotion();
             amazonPromotion.setSku(values[0]);
             amazonPromotion.setStandardPrice(Double.valueOf(values[1]));
             amazonPromotion.setSalePrice(Double.valueOf(values[2]));
             amazonPromotion.setSubsidyAmount(Double.valueOf(values[3]));
             Date startDate = dateFormatter.parse(values[4]);
             Date endDate = dateFormatter.parse(values[5]);
             amazonPromotion.setStartDate(startDate.getTime());
             amazonPromotion.setEndDate(endDate.getTime());
-            amazonPromotion.setPromotionActive(true);
+            amazonPromotion.setAddedOn(timeNow);
             amazonPromotion.setPromotionType(AmazonPromotionType.valueOf(promotionType));
             amazonPromoMap.put(amazonPromotion.getSku(), amazonPromotion);
+        }
         Client cc = new CatalogClient("catalog_service_server_host_amazon","catalog_service_server_port").getClient();
         if (!cc.addAmazonPromotion(amazonPromoMap)){
             throw new CatalogServiceException();
+        }
-//        if (promotionType.equalsIgnoreCase("LONGTERM")){
-//            PromotionFeed pm = new PromotionFeed();
-//            List<AmazonPromotion> list = new ArrayList<AmazonPromotion>(amazonPromoMap.values());
-//            String fPath = pm.CreatePromotionFeed(list);
-//            try {
-//                logger.info(fPath);
-//                pm.SubmitPromotionFeed(fPath);
-//            } catch (InterruptedException e) {
-//                // TODO Auto-generated catch block
-//                e.printStackTrace();
-//            } catch (MarketplaceWebServiceException e) {
-//                // TODO Auto-generated catch block
-//                e.printStackTrace();
-//            }
-//        }
-    }
+        if (promotionType.equalsIgnoreCase("LONGTERM")){
+            List<AmazonPromotion> list = new ArrayList<AmazonPromotion>(amazonPromoMap.values());
+            PromotionFeed pm = new PromotionFeed(list);
+            pm.start();
+        }
+    }
     private void changeItemInventory() throws NumberFormatException, TException {
         Client CatalogClient = new CatalogClient("catalog_service_server_host_amazon","catalog_service_server_port").getClient();
         if (StringUtils.isEmpty(holdInventory)) {
     public Long getTimetoShip(String itemId) throws LogisticsServiceException, TException{
         LogisticsClient logisticsClient = new LogisticsClient();
         return logisticsClient.getClient().getLogisticsInfo("110001", Long.valueOf(itemId), DeliveryType.COD, PickUpType.COURIER).getShippingTime();
+    }
-//      public Long getTimetoShip(String itemId) throws LogisticsServiceException, TException{
+      public Long getTimetoShip(String itemId) throws LogisticsServiceException, TException{
-//          return 0l;
+          return 0l;
-//    }
+    }
     public double getWanlcForItem(String itemId){
         InventoryClient inventoryServiceClient;
         try {
         } catch (IOException e) {
             System.out.println("Unable to stream the manifest file");
+        }
+    }
     public boolean checkEmptyString(Cell cell){
         if (cell==null){
             return true;
+        }
         return false;
     public void setExceptionalWanlc(String exceptionalWanlc) {
         this.exceptionalWanlc = exceptionalWanlc;
+    }
+    public void setFbaPromotionActive(boolean isFbaPromotionActive) {
+        this.isFbaPromotionActive = isFbaPromotionActive;
+    }
+    public boolean isFbaPromotionActive() {
+        return isFbaPromotionActive;
+    }
+    public void setFbbPromotionActive(boolean isFbbPromotionActive) {
+        this.isFbbPromotionActive = isFbbPromotionActive;
+    }
+    public boolean isFbbPromotionActive() {
+        return isFbbPromotionActive;
+    }
+    public void setFbaPromoPrice(String fbaPromoPrice) {
+        this.fbaPromoPrice = fbaPromoPrice;
+    }
+    public String getFbaPromoPrice() {
+        return fbaPromoPrice;
+    }
+    public void setFbbPromoPrice(String fbbPromoPrice) {
+        this.fbbPromoPrice = fbbPromoPrice;
+    }
+    public String getFbbPromoPrice() {
+        return fbbPromoPrice;
+    }
+    public void setPromoItemId(String promoItemId) {
+        this.promoItemId = promoItemId;
+    }
+    public String getPromoItemId() {
+        return promoItemId;
+    }
+}

Subversion Repositories SmartDukaan

(root)/trunk/Support/src/main/java/in/shop2020/support/controllers/AmazonListController.java – Rev 12586 → 12661