SmartDukaan – /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/

Rev 36521 – Added RequestCachingFilter

amit — Mon, 11 May 2026 16:20:01 +0530

amit – 4 file(s) modified
Added RequestCachingFilter

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/config/CacheConfig.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java

Rev 36486 – offer batch: add reprocess guard and hasUnfinishedBatch check in submitBatchAsync

amit — Thu, 07 May 2026 17:32:57 +0530

amit – 1 file(s) modified
offer batch: add reprocess guard and hasUnfinishedBatch check in submitBatchAsync

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferBatchService.java

Rev 36451 – Add reference field to catalog.offer and catalog.scheme for payout collation

amit — Sat, 02 May 2026 17:29:48 +0530

amit – 7 file(s) modified
Add reference field to catalog.offer and catalog.scheme for payout collation

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Offer.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateOfferRequest.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateSchemeRequest.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/add_reference_to_offer_scheme.sql

Rev 36374 – schemes and offer for v2 version

ranu — Fri, 24 Apr 2026 15:23:35 +0530

ranu – 9 file(s) modified
schemes and offer for v2 version

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoOfferController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoSchemeController.java

Rev 36357 – Fix background-thread 'no session' error in DB guard. CronBatchRepository.selectRunningForOffer uses ...

amit — Wed, 22 Apr 2026 17:43:38 +0530

amit – 2 file(s) modified
Fix background-thread 'no session' error in DB guard. CronBatchRepository.selectRunningForOffer uses getCurrentSession() which needs an open tx; when OfferBatchService.processOfferWithBatch is called from the async worker thread (no outer tx), the guard query crashed with 'Could not obtain transaction-synchronized Session'. Offer 8819 submit succeeded but the background run died at the guard — before createBatch, so no cron_batch / cron_batch_item rows. Added CronBatchService.findRunningForOffer wrapping the repo call in @Transactional(readOnly=true); orchestrator calls the service method instead of repo directly. Matches the pattern used by loadOfferRequest / createBatch / calculate*Payouts — every caller opens its own tx.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/cron/CronBatchService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferBatchService.java

Rev 36355 – Skip already-paid partners before creating cron_batch_item rows. Adds hasRemainingSellinPayout / ...

amit — Wed, 22 Apr 2026 16:40:56 +0530

amit – 2 file(s) modified
Skip already-paid partners before creating cron_batch_item rows. Adds hasRemainingSellinPayout / hasRemainingOfferPayout predicates on OfferProcessingHelper that mirror the amount calc in processPartner*Payout. Orchestrator filters partnerPayouts through these before createBatch — partners whose serials are fully paid (amount=0 after subtracting serialNumberPaid) are excluded entirely. Reruns of a completed offer now create no batch at all (log says 'all N eligible partners already fully paid, skipping batch'); partial reruns log filtered count. Avoids audit-trail noise of SUCCESS items that did zero work.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferBatchService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferProcessingHelper.java

Rev 36354 – DB-backed concurrent-run guard for OfferBatchService.processOfferWithBatch. Adds CronBatchRepository.selectRunningForOffer(offerId) — single HQL ...

amit — Wed, 22 Apr 2026 16:17:20 +0530

amit – 3 file(s) modified
DB-backed concurrent-run guard for OfferBatchService.processOfferWithBatch. Adds CronBatchRepository.selectRunningForOffer(offerId) — single HQL query for RUNNING cron_batch rows named processSellinOffer-N or processActivationOffer-N. OfferBatchService early-returns (with a log) if any such row exists. Covers the three gaps the in-memory guard can't: JVM restart, multi-JVM, cron CLI + user click racing. Applies to both sync (cron --processOffersWithBatch) and async (/offer/process HTTP) paths.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/CronBatchRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/CronBatchRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferBatchService.java

Rev 36347 – Add submitBatchAsync for fire-and-forget /offer/process — schedules processOfferWithBatch on a ...

amit — Wed, 22 Apr 2026 14:43:56 +0530

amit – 1 file(s) modified
Add submitBatchAsync for fire-and-forget /offer/process — schedules processOfferWithBatch on a bounded background pool (3 daemon threads) and returns immediately with a human-readable message. In-memory ConcurrentHashMap.newKeySet() per-offerId guard prevents duplicate concurrent runs for the same offer (the scenario that caused offer 8802 deadlocks). Sync processOfferWithBatch kept unchanged for cron CLI (--processOffersWithBatch).

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferBatchService.java

Rev 36342 – Add OfferBatchService orchestrator — shared batch entrypoint for offer processing, ...

amit — Wed, 22 Apr 2026 12:30:47 +0530

amit – 1 file(s) modified
Add OfferBatchService orchestrator — shared batch entrypoint for offer processing, used by cron CLI and /offer/process controllers. Loads offer, calls calculate*Payouts (read), creates cron_batch, runs each partner in REQUIRES_NEW via OfferProcessingHelper, finalizes batch and emails on partial failure. No @Transactional on the class — must not carry outer tx.

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferBatchService.java

Rev 36337 – Move CronBatchService and OfferProcessingHelper from cron to dao so web/fofo ...

amit — Wed, 22 Apr 2026 11:53:38 +0530

amit – 4 file(s) modified
Move CronBatchService and OfferProcessingHelper from cron to dao so web/fofo can reuse the batch infra; fix empty-IMEI NPE in getInventoryItemMap that broke /offer/process for partners with no billed/scanned serials

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/cron
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/cron/CronBatchService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferProcessingHelper.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java

Rev 36305 – Batch processing infrastructure + per-partner offer processing + partner limit ...

amit — Sun, 19 Apr 2026 07:57:42 +0530

amit – 21 file(s) modified
Batch processing infrastructure + per-partner offer processing + partner limit optimization + investment cache eviction on billing/payment/cancellation with 3hr TTL

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/config/CacheConfig.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/CronBatch.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/CronBatchItem.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction/CronBatchItemStatus.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction/CronBatchStatus.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/CronBatchItemRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/CronBatchItemRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/CronBatchRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/CronBatchRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferPartnerPayoutData.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/SellinPartnerPayoutData.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerInvestmentService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerInvestmentServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/PartnerLimitUpdateData.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/create_cron_batch_tables.sql

Rev 36103 – Add DN rejection with full reversal: restore inventory, schemes, price ...

amit — Mon, 30 Mar 2026 19:34:45 +0530

amit – 28 file(s) modified
Add DN rejection with full reversal: restore inventory, schemes, price drops, offers; add deny reason to purchase return items; add purchase return notification service

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PurchaseReturnItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnNotificationService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnNotificationServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/db
+ /trunk/profitmandi-dao/src/main/resources/db/migration
+ /trunk/profitmandi-dao/src/main/resources/db/migration/pt_osc_large_tables.sh
+ /trunk/profitmandi-dao/src/main/resources/db/migration/V001__create_pinelabs_tables.sql
+ /trunk/profitmandi-dao/src/main/resources/db/migration/V002__cleanup_old_pinelabs_implementation.sql
+ /trunk/profitmandi-dao/src/main/resources/db/migration/V003__optimize_mobile_brand_queries.sql
+ /trunk/profitmandi-dao/src/main/resources/db/migration/V004__optimize_today_po_queries.sql
+ /trunk/profitmandi-dao/src/main/resources/db/migration/V005__optimize_lead_description_query.sql
+ /trunk/profitmandi-dao/src/main/resources/db/migration/V006__optimize_aging_stock_queries.sql
+ /trunk/profitmandi-dao/src/main/resources/db/migration/V007__add_source_to_partner_type_change.sql
+ /trunk/profitmandi-dao/src/main/resources/db/migration/V008__optimize_mobile_lmp_graph_query.sql
+ /trunk/profitmandi-dao/src/main/resources/db/migration/V009__add_margin_only_to_category.sql
+ /trunk/profitmandi-dao/src/main/resources/db/migration/V010__add_loan_fofo_id_index.sql
+ /trunk/profitmandi-dao/src/main/resources/db/migration/V011__add_prebooking_payment_mode.sql
+ /trunk/profitmandi-dao/src/main/resources/db/migration/V012__create_purchase_return_order.sql
+ /trunk/profitmandi-dao/src/main/resources/db/migration/V013__add_invoice_return_menu.sql
+ /trunk/profitmandi-dao/src/main/resources/db/migration/V014__add_deny_reason_to_purchase_return_item.sql

Rev 36081 – Use JDK serialization for Redis caches with Map keys ...

amit — Thu, 26 Mar 2026 20:12:38 +0530

amit – 10 file(s) modified
Use JDK serialization for Redis caches with Map<Integer,...> keys

GenericJackson2JsonRedisSerializer converts Map Integer keys to String
during JSON serialization. On deserialization, map.get(Integer) returns
null since keys are now Strings. This broke allOffers, offer.slabpayout,
catalog.published_yearmonth, and offer.achievement caches.

Fix: Use JdkSerializationRedisSerializer for these specific caches to
preserve exact Java types. Added Serializable to 9 model classes in the
offer object graph: CreateOfferRequest, TargetSlab, ItemCriteriaPayout,
ItemCriteria, PartnerCriteria, PayoutSlab, AmountModel, QtyAmountModel,
DateRangeModel.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/config/CacheConfig.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/AmountModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateOfferRequest.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/DateRangeModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ItemCriteriaPayout.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/QtyAmountModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/TargetSlab.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/ItemCriteria.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/PartnerCriteria.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/PayoutSlab.java

Rev 36051 – Support FIXED per-pc payout with VALUE target: use per-criteria qty ...

amit — Tue, 24 Mar 2026 16:09:16 +0530

amit – 3 file(s) modified
Support FIXED per-pc payout with VALUE target: use per-criteria qty for payout calculation, sort payoutSlabs ascending

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferTargetSlabRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java

Rev 36049 – Redesign offer caching: separate definition from achievement, per-partner Redis cache, ...

amit — Tue, 24 Mar 2026 13:41:34 +0530

amit – 5 file(s) modified
Redesign offer caching: separate definition from achievement, per-partner Redis cache, deep-copy before mutation, centralized eviction

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/config/CacheConfig.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java

Rev 35942 – Reduce log noise: demote verbose INFO to DEBUG, fix empty ...

amit — Thu, 05 Mar 2026 19:01:01 +0530

amit – 10 file(s) modified
Reduce log noise: demote verbose INFO to DEBUG, fix empty list SQLGrammarException in getItemAvailability, fix copy-paste bug in PartnerTypeChangeServiceImpl, fix string concatenation in log statements

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOpeningStockRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PartnerTypeChangeRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PartnerTypeChangeServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/authentication/RoleManager.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/FofoUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/SaholicInventoryServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/TodayOfferServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerInvestmentServiceImpl.java

Rev 35924 – Per-criteria target and payout editing for offers - Add ...

amit — Mon, 02 Mar 2026 17:46:27 +0530

amit – 6 file(s) modified
Per-criteria target and payout editing for offers

- Add UpdateSlabRequest/UpdateOfferSlabsRequest models for per-slab updates
- Add id field to PayoutSlab, populate from TargetSlabEntity.id
- Add updateOfferSlabs() service method: validates slab ownership, updates payoutTarget and payoutValue independently
- Keep updateOfferTargets() for backward compatibility

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/UpdateOfferSlabsRequest.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/UpdateSlabRequest.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferTargetSlabRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/PayoutSlab.java

Rev 35889 – Fix updateOfferTargets unique key constraint - group slabs by payout_target ...

amit — Sat, 28 Feb 2026 21:54:18 +0530

amit – 1 file(s) modified
Fix updateOfferTargets unique key constraint - group slabs by payout_target and use updateById

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java

Rev 35887 – Fix: use partner_criteria JSON instead of offer_partners table for partner ...

amit — Sat, 28 Feb 2026 20:11:47 +0530

amit – 3 file(s) modified
Fix: use partner_criteria JSON instead of offer_partners table for partner management

Rev 35885 – Admin offer management: add/remove partners, clone offer, update targets + ...

amit — Sat, 28 Feb 2026 18:06:21 +0530

amit – 6 file(s) modified
Admin offer management: add/remove partners, clone offer, update targets + empty guard fix in getCreateOfferRequest

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferPartnerRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferPartnerRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferTargetSlabRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferTargetSlabRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java

Rev 35861 – ofer service replace redi cache to normal cache

ranu — Thu, 26 Feb 2026 17:55:29 +0530

ranu – 1 file(s) modified
ofer service replace redi cache to normal cache

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java

Rev 35856 – Optimize activated stock query (no cache), move offer cache to ...

amit — Thu, 26 Feb 2026 16:50:39 +0530

amit – 7 file(s) modified
Optimize activated stock query (no cache), move offer cache to Redis, add bulk publish and delete offer

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/InventoryItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java

Rev 35743 – Added cache annotation to TodayOfferServiceImpl

vikas — Wed, 11 Feb 2026 17:41:56 +0530

vikas – 1 file(s) modified
Added cache annotation to TodayOfferServiceImpl

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/TodayOfferServiceImpl.java

Rev 35675 – Offer detail modal: add slab progress one-liner, clickable dashboard titles, ...

amit — Sat, 07 Feb 2026 00:47:09 +0530

amit – 5 file(s) modified
Offer detail modal: add slab progress one-liner, clickable dashboard titles, reorder columns

- Set nextSlab/shortValue on ItemCriteriaPayout in getOfferMargins path (sellin + sellout/activation)
- Add slab progress message after table (next slab distance or max slab achieved)
- Reorder columns: Models | Target | Base Sale | Model Sale | Payout Rate | Est. Payout
- Make offer name on partner dashboard clickable to open detail modal
- Update JS selector from p.description-offer to .description-offer

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysisDashboard.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_margin_detail_partner.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/published-offers.vm

Rev 35673 – Fix missing date range filter in per-criteria billed calculation for ...

amit — Fri, 06 Feb 2026 23:39:11 +0530

amit – 1 file(s) modified
Fix missing date range filter in per-criteria billed calculation for sellout/activation

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java

Rev 35667 – Refactor getOfferMargins: extract helpers, add NPE guards, remove unused vars ...

amit — Fri, 06 Feb 2026 16:23:49 +0530

amit – 1 file(s) modified
Refactor getOfferMargins: extract helpers, add NPE guards, remove unused vars and side effects

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java

Rev 35595 – Migrate from C3P0 to HikariCP connection pooling - Replace ...

amit — Tue, 27 Jan 2026 21:31:11 +0530

amit – 9 file(s) modified
Migrate from C3P0 to HikariCP connection pooling

- Replace C3P0 properties with HikariCP settings in all properties files
- Delete unused persistence.xml (was not referenced by any code)
- New settings: maximumPoolSize=20, minimumIdle=2, idleTimeout=30s, maxLifetime=30min

~ /trunk/profitmandi-dao/build.gradle
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/FofoUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
~ /trunk/profitmandi-dao/src/main/resources/META-INF/dev.properties
x /trunk/profitmandi-dao/src/main/resources/META-INF/persistence.xml
~ /trunk/profitmandi-dao/src/main/resources/META-INF/prod.properties
~ /trunk/profitmandi-dao/src/main/resources/META-INF/staging.properties

Rev 35583 – code updated by

ranu — Wed, 21 Jan 2026 19:23:11 +0530

ranu – 18 file(s) modified
code updated by

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/Bulletin.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BulletinOfferModal.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BulletinPostModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/BulletinRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/BulletinRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/TodayOfferService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/TodayOfferServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ContentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/bulletin.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/bulletin-list.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/post-bulletin.vm

Rev 35551 – bulletin updated on dashboard and give access category department

ranu — Thu, 15 Jan 2026 13:26:40 +0530

ranu – 1 file(s) modified
bulletin updated on dashboard and give access category department

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/TodayOfferServiceImpl.java

Rev 35549 – bulletin updated on dashboard and give access category department

ranu — Thu, 15 Jan 2026 12:55:23 +0530

ranu – 23 file(s) modified
bulletin updated on dashboard and give access category department

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/cs/Bulletin.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BulletinOfferModal.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BulletinPostModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerBrief.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/BulletinRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/BulletinRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/TodayOfferService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/TodayOfferServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ContentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/FileUploadController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/bulletin.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/mobile-brand-wise-report.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/post-bulletin.vm

Rev 35501 – today offer modal done

ranu — Tue, 30 Dec 2025 12:52:59 +0530

ranu – 30 file(s) modified
today offer modal done

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Catalog.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CatalogBrief.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerCriteriaPojo.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PayoutSlabModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/SchemeOfferModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/TodayCatalogOfferModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/TodayOfferGroupKey.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/TodayOfferModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/WebOfferModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CatalogRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CatalogRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CustomerOfferItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CustomerOfferItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemCriteriaRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemCriteriaRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/IciciLombardService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/TodayOfferService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/TodayOfferServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/price-circular.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-brandwise-detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-stock.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today-fofo-offer.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today-offer-list.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today-offer.vm

Rev 35394 – Improved performance

amit — Wed, 17 Dec 2025 01:36:42 +0530

amit – 52 file(s) modified
Improved performance

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PineLabs.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/ASTRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/ASTRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehouseInventoryItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CreateOfferRequest.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/AuthRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/AuthRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/PartnerCollectionRemarkRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/auth/PartnerCollectionRemarkRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemCriteriaRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsService1Impl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PositionRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PositionRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/DistrictMasterRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/DistrictMasterRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoLineItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoLineItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/HygieneDataRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/HygieneDataRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/OfferPayoutRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/OfferPayoutRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PendingOrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PineLabsRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PineLabsRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/StateRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/StateRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/CounterRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/CounterRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/PrivateDealUserRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/PrivateDealUserRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/loiForm/LoiFormServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/PurSaleServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/PineLabsPaymentService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerStatsServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricecircular/PriceCircularService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseServiceImpl.java

Rev 35205 – Offer send Notification refactoring

amit — Wed, 15 Oct 2025 16:42:32 +0530

amit – 3 file(s) modified
Offer send Notification refactoring

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java

Rev 34624 – Fixed

amit.gupta — Thu, 29 May 2025 18:18:11 +0530

amit.gupta – 1 file(s) modified
Fixed

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java

Rev 34623 – Added logs

amit.gupta — Thu, 29 May 2025 16:40:40 +0530

amit.gupta – 1 file(s) modified
Added logs

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java

Rev 34231 – Now amount for specified imeis can also be rolled out

amit.gupta — Sat, 22 Feb 2025 11:08:36 +0530

amit.gupta – 1 file(s) modified
Now amount for specified imeis can also be rolled out

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java

Rev 34227 – config

amit.gupta — Thu, 20 Feb 2025 17:22:18 +0530

amit.gupta – 1 file(s) modified
config

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java

Rev 34226 – config

amit.gupta — Thu, 20 Feb 2025 16:55:53 +0530

amit.gupta – 1 file(s) modified
config

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java

Rev 34217 – Eligible imeis should only pe paid out

amit.gupta — Thu, 20 Feb 2025 12:18:17 +0530

amit.gupta – 3 file(s) modified
Eligible imeis should only pe paid out

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferEligibleImeiRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferEligibleImeiRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java

Rev 34148 – code reverted as amit serial number

ranu — Tue, 21 Jan 2025 11:46:10 +0530

ranu – 1 file(s) modified
code reverted as amit serial number

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java