WebSVN – SmartDukaan – Diff – /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java

 import com.smartdukaan.cron.scheduled.amazon.shop.AmazonPurchaseService;
 import com.smartdukaan.cron.scheduled.amazon.shop.OrderSummary;
 import com.smartdukaan.cron.scheduled.amazon.shop.model.OrderRow;
 import com.smartdukaan.cron.scheduled.ambreports.AbmReportSender;
 import com.spice.profitmandi.common.enumuration.ItemType;
+import com.spice.profitmandi.common.enumuration.PurchaseReturnStatus;
 import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
 import com.spice.profitmandi.common.model.CustomRetailer;
 import com.spice.profitmandi.common.model.ImeiDropSummaryModel;
 import com.spice.profitmandi.common.model.InvoicePdfModel;
 import com.spice.profitmandi.common.model.ProfitMandiConstants;
     @Autowired
     private DebitNoteRepository debitNoteRepository;
     @Autowired
+    private PurchaseReturnOrderRepository purchaseReturnOrderRepository;
+    @Autowired
     private OfferService offerService;
     @Autowired
     private GenericRepository genericRepository;
                 continue;
+            }
+        }
+    }
-    public void cancelDn(String debitNoteNumber) throws Exception {
+    public void cancelDn(String debitNoteNumber, boolean recreatePri) throws Exception {
         DebitNote debitNote = debitNoteRepository.selectDebitNoteByNumber(debitNoteNumber);
         List<PurchaseReturnItem> purchaseReturnItems = purchaseReturnItemRepository
                 .selectAllByDebitNoteId(debitNote.getId());
+        // Block cancellation if any item is already refunded
+        boolean hasReturned = purchaseReturnItems.stream()
+                .anyMatch(x -> PurchaseReturnStatus.RETURNED.equals(x.getStatus()));
+        if (hasReturned) {
+            throw new Exception("Cannot cancel DN " + debitNoteNumber + " - items already returned and refunded to wallet");
+        }
         // Select all inventory Item
         Set<Integer> inventoryItemIds = purchaseReturnItems.stream().map(x -> x.getInventoryItemId())
                 .collect(Collectors.toSet());
         List<InventoryItem> inventoryItems = inventoryItemRepository.selectByIds(inventoryItemIds);
+        // Reverse wallet refund if already processed
+        List<PurchaseReturnOrder> purchaseReturnOrders = purchaseReturnOrderRepository.selectByDebitNoteId(debitNote.getId());
+        for (PurchaseReturnOrder pro : purchaseReturnOrders) {
+            if (pro.getRefundTimestamp() != null && pro.getRefundAmount() != null && pro.getRefundAmount() > 0) {
+                walletService.consumeAmountFromWallet(debitNote.getFofoId(), debitNote.getId(),
+                        WalletReferenceType.PURCHASE, "Reversed - DN cancelled " + debitNoteNumber,
+                        pro.getRefundAmount(), LocalDateTime.now());
+                LOGGER.info("Reversed wallet refund of {} for DN {}", pro.getRefundAmount(), debitNoteNumber);
+            }
+        }
         for (InventoryItem inventoryItem : inventoryItems) {
             if (!StringUtils.isEmpty(inventoryItem.getSerialNumber())) {
                 inventoryItem.setGoodQuantity(1);
                 inventoryItem.setLastScanType(ScanType.PURCHASE);
-                ScanRecord sr = scanRecordRepository.selectByInventoryItemId(inventoryItem.getId()).stream()
+                scanRecordRepository.selectByInventoryItemId(inventoryItem.getId()).stream()
-                        .filter(x -> x.getType().equals(ScanType.PURCHASE_RET)).findFirst().get();
+                        .filter(x -> x.getType().equals(ScanType.PURCHASE_RET)).findFirst()
-                scanRecordRepository.delete(sr);
+                        .ifPresent(sr -> scanRecordRepository.delete(sr));
                 CurrentInventorySnapshot cis = currentInventorySnapshotRepository
                         .selectByItemAndFofoId(inventoryItem.getItemId(), inventoryItem.getFofoId());
                 if (cis == null) {
                     cis = new CurrentInventorySnapshot();
                     cis.setFofoId(inventoryItem.getFofoId());
-                    cis.setItemId(inventoryItem.getId());
+                    cis.setItemId(inventoryItem.getItemId());
                     currentInventorySnapshotRepository.persist(cis);
+                }
                 cis.setAvailability(cis.getAvailability() + 1);
                 schemeService.processSchemeIn(inventoryItem.getPurchaseId(), inventoryItem.getFofoId());
+            }
+        }
+        if (recreatePri) {
+            // Reset PRIs to CREATED so partner can re-initiate DN without re-requesting
+            for (PurchaseReturnItem pri : purchaseReturnItems) {
+                pri.setStatus(PurchaseReturnStatus.CREATED);
+                pri.setDebitNoteId(0);
+                pri.setApproveTimestamp(null);
+                pri.setDenyTimestamp(null);
+                pri.setRefundTimestamp(null);
+                pri.setCreateTimestamp(LocalDateTime.now());
+            }
+        } else {
-        purchaseReturnItems.stream().forEach(x -> purchaseReturnItemRepository.delete(x));
+            purchaseReturnItems.forEach(x -> purchaseReturnItemRepository.delete(x));
+        }
+        LOGGER.info("Cancelled DN {} recreatePri={}", debitNoteNumber, recreatePri);
+    }
     public void processPd(int priceDropId) throws ProfitMandiBusinessException {
         priceDropService.processPriceDrop(priceDropId, false);
+    }

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java – Rev 35848 → 36053