WebSVN – SmartDukaan – Diff – /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java

         int itemsCount = 0;
         float totalCashback = 0;
         for (Map.Entry<CatalogSummaryModel, List<SchemeSummaryModel>> catalogSummaryModelListEntry : catalogSchemeSummaryMap.entrySet()) {
             CatalogSummaryModel catalogSummaryModel = catalogSummaryModelListEntry.getKey();
-            List<SchemeSummaryModel> schemeSummaryModels = catalogSummaryModelListEntry.getValue().stream().filter(x->x !=null).collect(Collectors.toList());
+            List<SchemeSummaryModel> schemeSummaryModels = catalogSummaryModelListEntry.getValue().stream().filter(x -> x != null).collect(Collectors.toList());
-            schemeSummaryModels.stream().filter(x -> x!=null && x.getSchemeType().equals(SchemeType.IN)).forEach(x -> x.setProcess(true));
+            schemeSummaryModels.stream().filter(x -> x != null && x.getSchemeType().equals(SchemeType.IN)).forEach(x -> x.setProcess(true));
             if (schemeSummaryModels.stream().filter(x -> x.isProcess()).count() == 0) continue;
             List<InventoryItem> modelInventoryItems = catalogInventoryItemMap.get(catalogSummaryModel.getCatalogId());
             for (InventoryItem inventoryItem : modelInventoryItems) {
                 float inventoryItemCashback = this.createSchemeInOut(schemeSummaryModels, inventoryItem, partnerType);
                 if (inventoryItemCashback > 0) {
             int count = 0;
             for (Map.Entry<CatalogSummaryModel, List<SchemeSummaryModel>> catalogSummaryModelListEntry : catalogSchemeSummaryMap.entrySet()) {
                 CatalogSummaryModel catalogSummaryModel = catalogSummaryModelListEntry.getKey();
-                List<SchemeSummaryModel> schemeSummaryModels = catalogSummaryModelListEntry.getValue().stream().filter(x->x != null).collect(Collectors.toList());
+                List<SchemeSummaryModel> schemeSummaryModels = catalogSummaryModelListEntry.getValue().stream().filter(x -> x != null).collect(Collectors.toList());
                 List<SchemeType> allOutSchemeTypes = new ArrayList<>();
                 allOutSchemeTypes.addAll(Arrays.asList(SchemeType.ACTIVATION, SchemeType.INVESTMENT, SchemeType.SPECIAL_SUPPORT, SchemeType.SELLOUT));
                 allOutSchemeTypes.addAll(OUT_SCHEME_TYPES);
                 schemeSummaryModels.stream().filter(x -> allOutSchemeTypes.contains(x.getSchemeType())).forEach(x -> x.setProcess(true));
                 if (schemeSummaryModels.stream().filter(x -> x.isProcess()).count() == 0) continue;
         WalletReferenceType walletReferenceType = schemeTypes.containsAll(SchemeService.OUT_SCHEME_TYPES) ? WalletReferenceType.SCHEME_OUT
                 : schemeTypes.contains(SchemeType.ACTIVATION) ? WalletReferenceType.ACTIVATION_SCHEME
                 : schemeTypes.contains(SchemeType.SPECIAL_SUPPORT) ? WalletReferenceType.SPECIAL_SUPPORT
                 : schemeTypes.contains(SchemeType.INVESTMENT) ? WalletReferenceType.INVESTMENT_PAYOUT : null;
-        if (walletReferenceType == null)
-            if (amountToRollback > 0 && walletReferenceType != null) {
+        if (amountToRollback > 0 && walletReferenceType != null) {
-                // Mark appropriate reference of rollback investment margin
+            // Mark appropriate reference of rollback investment margin
-                if (schemeTypes.contains(SchemeType.INVESTMENT)) {
+            if (schemeTypes.contains(SchemeType.INVESTMENT)) {
-                    List<UserWalletHistory> userWalletHistoryList = userWalletHistoryRepository.selectAllByreferenceIdandreferenceType(reversalReference, walletReferenceType);
+                List<UserWalletHistory> userWalletHistoryList = userWalletHistoryRepository.selectAllByreferenceIdandreferenceType(reversalReference, walletReferenceType);
-                    if (userWalletHistoryList.size() == 0) {
+                if (userWalletHistoryList.size() == 0) {
-                        reversalReference = Integer
+                    reversalReference = Integer
-                                .parseInt(FormattingUtils.getYearMonth(schemeTypeMap.get(SchemeType.INVESTMENT).getCreditTimestamp().minusMonths(1)));
+                            .parseInt(FormattingUtils.getYearMonth(schemeTypeMap.get(SchemeType.INVESTMENT).getCreditTimestamp().minusMonths(1)));
-                    }
+                }
-                walletService.rollbackAmountFromWallet(fofoId, amountToRollback, reversalReference, walletReferenceType,
-                        reversalReason, LocalDateTime.now());
+            }
+            walletService.rollbackAmountFromWallet(fofoId, amountToRollback, reversalReference, walletReferenceType,
+                    reversalReason, LocalDateTime.now());
+        }
+    }
     @Override
     public double getTotalMargin(int itemId, PartnerType partnerType, LocalDateTime dateTime) {
         Session session = sessionFactory.getCurrentSession();
                 InventoryPayoutModel inventoryPayoutModel = priceCircularService.getPayouts(ii);
                 AmountModel amountModel = new AmountModel();
                 amountModel.setAmount(scheme.getAmount());
                 amountModel.setAmountType(scheme.getAmountType());
                 double amountToRollout = inventoryPayoutModel.getRolloutAmount(amountModel);
-                pendingPayout.setAmount((float)amountToRollout);
+                pendingPayout.setAmount((float) amountToRollout);
                 if (scheme.getType().equals(SchemeType.ACTIVATION)) {
                     walletService.addAmountToWallet(fofoId, orderId, WalletReferenceType.ACTIVATION_SCHEME,
                             "Activation margin for " + ii.getItem().getItemDescriptionNoColor() + ", Imei - " + serialNumber, (float) amountToRollout,
                             fofoOrder.getCreateTimestamp());
                     pendingPayout.setStatusDescription("Activation margin credited, activated on " + FormattingUtils.formatDate(activatedImei.getActivationTimestamp()));

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java – Rev 31987 → 32058