Subversion Repositories SmartDukaan

Rev

Show changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
37086 6 d 13 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/ Remove dead rejectPriceDropsOfApprovedImeis (superseded by PriceDropBatchService)

The noon reprocess now runs via PriceDropBatchService (per-drop REQUIRES_NEW);
the old single-transaction PriceDropService.rejectPriceDropsOfApprovedImeis and
its interface declaration have no remaining callers.
 
37082 6 d 14 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/ Fix noon price-drop lock storm + wallet-rollback divergence

Per-drop transaction isolation for the noon price-drop reprocess, mirroring
the offer batch pattern (OfferBatchService / OfferProcessingHelper):
- PriceDropProcessingHelper: readOnly id fetch + REQUIRES_NEW per-drop
reprocess (processPriceDrop) + markItemSuccess
- PriceDropBatchService: no-@Transactional orchestrator - fetch ids,
createBatch, per-drop loop with markItemFailed, finalizeBatch

Previously the whole reprocess ran under ScheduledTasks' class-level
@Transactional as one ~20-min transaction, holding user_wallet
PESSIMISTIC_WRITE locks for the entire run and timing out live
/addAmountToWallet, /create-order and /scanSerialized at noon
(LockAcquisitionException).

Also narrow the rollback catch in PriceDropServiceImpl from Exception to
ProfitMandiBusinessException: lock/DB failures now propagate and roll back
the drop's REQUIRES_NEW unit (stays APPROVED, retried next run) instead of
being swallowed while the IMEI is marked REJECTED with the payout still in
the partner's wallet.
 
37002 18 d 9 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ Price-hike: reprocess schemes as per price-drop logic on deduction (updatePriceDrop + reverse/reprocess) and remove getPayouts clamp so hike raises DP -> higher margin. GRN path adjusts basis only (GRN's own processSchemeIn recomputes); endpoint does full reprocess on already-GRN'd units.  
36999 18 d 10 h amit /trunk/profitmandi-dao/src/main/ Price-hike deduction (self-contained): revert hike logic from price-drop flow + remove deduct_on_hike flag; add GRN hook (PurchaseServiceImpl, before schemes) and on-demand executor endpoint that debit under-charged units billed in the hike's [affected_on, created_on] window. Idempotent per (hike, imei).  
36995 18 d 14 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/ Price-hike deduction Option 2 (under-charge recovery): gate hike eligibility on order bill date within [affected_on, created_on]; paid-DP Check 2 restricted to its reconciled-guard role  
36977 19 d 14 h amit /trunk/profitmandi-dao/src/main/ Price-hike deduction: add deduct_on_hike flag; process flagged hikes as symmetric mirror of drops (wallet debit + scheme reverse/recompute); remove getPayouts price-increase clamp so hikes raise scheme/offer margin  
36813 40 d 16 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/ ok  
36639 59 d 11 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/ Add documentation to getInventoryForPriceDrop validation method

Javadoc and inline comments explaining the three eligibility checks:
purchase return, effective DP (hike-reversal guard), and billing timestamp.
 
36638 59 d 12 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/ fix: price drop processing - prevent incorrect credits and priceDropAmount inflation

Two fixes in PriceDropServiceImpl:
1. Use approvedList instead of pendingList in updatePriceDrop call - rejected items
no longer get their priceDropAmount inflated when other items in the same batch
are approved
2. Add effectiveDP eligibility check for PENDING items - rejects IMEIs where
unitPrice - priceDropAmount <= newDp, preventing partners billed at pre-hike
price from receiving reversal drop credits. Check is skipped for APPROVED items
to allow legitimate re-processing and brand-driven rejections
 
36103 112 d 8 h amit /trunk/profitmandi-dao/src/main/ Add DN rejection with full reversal: restore inventory, schemes, price drops, offers; add deny reason to purchase return items; add purchase return notification service  
35981 131 d 12 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/ Fix processPriceDrop crash when purchaseIds list is empty - guard empty list before selectAllByIds query  
35978 132 d 7 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/ Fix: Add empty check for inventoryItemsToProcess in processPriceDrop to prevent 'List should not be empty' error when no matching inventory items found  
35907 141 d 5 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/ Fix N+1 queries in PriceDropServiceImpl: batch-fetch purchases, orders, and FofoStores; replace System.out.println with LOGGER  
35187 280 d 9 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/ Minor change  
34851 351 d 10 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/ donotcommit  
33809 662 d 16 h ranu /trunk/ partner loan ledger statment  
33729 684 d 12 h ranu /trunk/ debit not filter date wise and generate excel  
33663 707 d 13 h amit.gupta /trunk/ Added Loan related improvements  
33459 760 d 8 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Fixed changes regarding credit issue  
33432 776 d 8 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ Fixed bug due to price drop  

Show All