SmartDukaan – //trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/

Rev 36525 – code committed for scheme and offers earning for v2

ranu — Tue, 12 May 2026 12:24:31 +0530

ranu – 3 file(s) modified
code committed for scheme and offers earning for v2

Rev 36524 – Fix:Fix first po and edge case for bulk order

aman — Mon, 11 May 2026 18:02:13 +0530

aman – 2 file(s) modified
Fix:Fix first po and edge case for bulk order

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerOnBoardingPanel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/StoreTimelineTatService.java

Rev 36518 – Fix:Fix first po and edge case for bulk order

aman — Mon, 11 May 2026 15:16:06 +0530

aman – 6 file(s) modified
Fix:Fix first po and edge case for bulk order

~ /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/transaction/TransactionApprovalRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoOrderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoPurchaseController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoPurchaseReturnController.java

Rev 36513 – Add running_balance to userwallethistory: persist wallet balance after each transaction ...

amit — Sun, 10 May 2026 18:10:51 +0530

amit – 9 file(s) modified
Add running_balance to userwallethistory: persist wallet balance after each transaction for instant ledger display. Populate at all write paths (WalletService, adjustTransaction). Read directly in wallet statement template and CSV download. Includes backfill migration SQL. Renamed walletSummart to walletSummary.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrder.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/UserWalletHistory.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/WalletSummaryReportModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/migration_running_balance_wallet_history.sql
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-summary-report.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoWalletController.java

Rev 36508 – code committed for scheme and offers earning for v2

ranu — Sun, 10 May 2026 02:06:27 +0530

ranu – 8 file(s) modified
code committed for scheme and offers earning for v2

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/OfferPayout.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.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/SchemeInOutRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeInOutRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoSchemeController.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2SchemeController.java

Rev 36489 – Fix NULL handling in CN query NOT clause — reject/rollback ...

amit — Thu, 07 May 2026 17:48:24 +0530

amit – 3 file(s) modified
Fix NULL handling in CN query NOT clause — reject/rollback IS NOT NULL guard prevents SQL three-valued logic from excluding valid rows

Rev 36485 – Fix credit note queries: exclude same-period create+reject rows, replace BETWEEN ...

amit — Thu, 07 May 2026 15:13:26 +0530

amit – 3 file(s) modified
Fix credit note queries: exclude same-period create+reject rows, replace BETWEEN with >= <= for performance, fix AND/OR precedence bug in SchemeInOut

Rev 36471 – V2 Profile Update APIs

vikas — Mon, 04 May 2026 19:38:09 +0530

vikas – 9 file(s) modified
V2 Profile Update APIs

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoPartnerDocument.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/FranchiseeBankAccount.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoPartnerDocumentRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoPartnerDocumentRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/FranchiseeBankAccountService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/FranchiseeBankAccountServiceImpl.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoBankAccountController.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoPartnerDocumentController.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoProfileUpdateController.java

Rev 36446 – DN lifecycle: decouple rejection from restore, add DebitNoteStatus, retailer acknowledgment ...

amit — Fri, 01 May 2026 23:48:55 +0530

amit – 8 file(s) modified
DN lifecycle: decouple rejection from restore, add DebitNoteStatus, retailer acknowledgment flow

- Add DebitNoteStatus enum (CREATED/RECEIVED/APPROVED/REJECTED/CANCELLED) on debit_note table
- Add retailer_acknowledge_timestamp on purchase_return_order
- rejectReturn() no longer calls restoreReturnedItems() — inventory stays reduced until retailer confirms goods received back
- New acknowledgeRejectedReturn(): retailer confirms receipt, restores inventory+schemes+offers, DN→CANCELLED
- Set DN status in receiveDebitNoteItems (RECEIVED), refundOrder (APPROVED), rejectReturn (REJECTED)
- notifyReturnRejected: updated message, added Finance L1+L2 to CC
- notifyItemsReceived: added Finance L1
- New notifyRejectedGoodsAcknowledged notification
- SQL migration with backfill for existing data

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/DebitNote.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PurchaseReturnOrder.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/DebitNoteStatus.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/inventory/PurchaseReturnService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/migration_dn_status_retailer_ack.sql

Rev 36439 – Add outlet_name field to FofoStore entity, set from address.name on ...

amit — Fri, 01 May 2026 12:15:46 +0530

amit – 3 file(s) modified
Add outlet_name field to FofoStore entity, set from address.name on store creation

Adds outlet_name (VARCHAR 255) to FofoStore entity so the store's display
name is persisted directly on fofo_store instead of requiring a join through
retailer_registered_address -> address every time it is needed.

Sets fofoStore.setOutletName(retailerAddress.getName()) in both creation
paths: RetailerServiceImpl.createFofoStoreCodeByRetailerId (primary) and
RetailerController.createFofoStore (secondary).

Includes migration SQL script (migration_outlet_name_to_fofo_store.sql) to
ALTER TABLE and backfill existing rows from address.name. Must be run during
low-traffic window - fofo_store is heavily queried and ALTER takes a metadata
lock that blocks all concurrent SELECTs.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStore.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java
+ /trunk/profitmandi-dao/src/main/resources/sql/migration_outlet_name_to_fofo_store.sql

Rev 36397 – Scheme item windowing: add startDate/endDate per scheme_item. Each fofo.scheme_item ...

amit — Mon, 27 Apr 2026 14:38:57 +0530

amit – 7 file(s) modified
Scheme item windowing: add startDate/endDate per scheme_item.

Each fofo.scheme_item row now carries an optional [start_date, end_date]
window so the same (scheme_id, catalog_id) pair can be applicable for
different date ranges. Backward compatible: NULL window = always active.

- SchemeItem entity: composite (schemeId, catalogId) PK -> surrogate
long id (IDENTITY), unique (catalog_id, scheme_id, start_date, end_date),
audit cols (updatedBy, updatedOn).
- Scheme + TagListing named queries: gated by
'(si.start_date is null or :onDate between si.start_date and si.end_date)'.
- SchemeItemRepository: + selectById, selectBySchemeId,
existsOverlapping (half-open, with self-exclude), selectItemsOutsideWindow.
- SchemeService: + updateSchemeItemWindow / addSchemeItemWithDates /
clampSchemeItems with containment + overlap validation; drop dead
getTotalMargin.
- SchemeServiceImpl.processSchemeOut: pin scheme resolution to each
IMEI's GRN billing date (Purchase -> Order.billingTimestamp via
PurchaseService.getBillingDateOfPurchase) instead of fofoOrder
createTimestamp, aligning OUT with the existing IN behaviour.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Scheme.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/TagListing.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeItem.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeItemRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SchemeItemRepositoryImpl.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

Rev 36364 – Fix /activateFinanceServices returning empty row for retailers without partner_onboarding_panel ...

amit — Thu, 23 Apr 2026 14:44:31 +0530

amit – 1 file(s) modified
Fix /activateFinanceServices returning empty row for retailers without partner_onboarding_panel

Change selectFinanceServicesByFofoId named query to LEFT JOIN PartnerOnBoardingPanel.
Previously an inner join filtered out 32 fofo_stores (16 internal + 16 external)
lacking an onboarding panel row, so the /activateFinanceServices response rendered
empty for them (e.g. codeInt=1359 / UPGBN1359) even though the partner_service
save itself worked.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ServiceBrandsConfig.java

Rev 36356 – rbm rating dashboard view commited

ranu — Wed, 22 Apr 2026 17:16:50 +0530

ranu – 4 file(s) modified
rbm rating dashboard view commited

Rev 36336 – sales dispostion updated

ranu — Wed, 22 Apr 2026 11:46:23 +0530

ranu – 7 file(s) modified
sales dispostion updated

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/RbmRating.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SalesRating.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/RbmRatingRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/RbmRatingRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SalesRatingRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/SalesRatingRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java

Rev 36287 – sales dispostion updated

ranu — Thu, 16 Apr 2026 19:55:10 +0530

ranu – 3 file(s) modified
sales dispostion updated

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/RatingReminder.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/RatingReminderRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/RatingReminderRepositoryImpl.java

Rev 36285 – Force idx_order_customer_billing index on spilitStock queries — optimizer picks wrong ...

amit — Thu, 16 Apr 2026 19:46:06 +0530

amit – 2 file(s) modified
Force idx_order_customer_billing index on spilitStock queries — optimizer picks wrong index (978K global scan vs 902 rows per partner)

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/CurrentInventorySnapshot.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/CurrentInventorySnapshotRepositoryImpl.java

Rev 36282 – Optimize /partner/hidAllocation: replace N+1 getSpilitStock loop with batch call, add ...

amit — Thu, 16 Apr 2026 19:24:59 +0530

amit – 2 file(s) modified
Optimize /partner/hidAllocation: replace N+1 getSpilitStock loop with batch call, add fofo_id filter to sales subquery, fix DATE() preventing index usage on create_timestamp

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOpeningStock.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOpeningStockRepositoryImpl.java

Rev 36261 – Fix JPQL: replace date() and string literals with typed :billingStartDate ...

amit — Mon, 13 Apr 2026 18:29:28 +0530

amit – 2 file(s) modified
Fix JPQL: replace date() and string literals with typed :billingStartDate parameter, use NOT EXISTS instead of NOT IN

Rev 36259 – Fix: re-apply tertiary query, add NOT NULL guard in NOT ...

amit — Mon, 13 Apr 2026 16:13:13 +0530

amit – 2 file(s) modified
Fix: re-apply tertiary query, add NOT NULL guard in NOT IN subquery, @Transactional(readOnly) on repo reads, fix persist ordering in saveActivation

Rev 36255 – ActivatedImei revert

vikas — Sun, 12 Apr 2026 13:52:07 +0530

vikas – 1 file(s) modified
ActivatedImei revert

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.java

Rev 36252 – Add tertiary IMEI activation query, shared saveActivation method, fix date() ...

amit — Sun, 12 Apr 2026 10:26:11 +0530

amit – 3 file(s) modified
Add tertiary IMEI activation query, shared saveActivation method, fix date() query performance

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ActivatedImeiRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/ActivatedImeiRepositoryImpl.java

Rev 36242 – Fix:Attachment is Full-stock payment approval ,Timeline ui graphical summary, wod ...

aman — Fri, 10 Apr 2026 19:41:18 +0530

aman – 21 file(s) modified
Fix:Attachment is Full-stock payment approval ,Timeline ui graphical summary, wod initianl mail after store code creation

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStore.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/AddWalletRequestRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/AddWalletRequestRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/FullStockPaymentRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/FullStockPaymentRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/StoreTimelineTatRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/loiForm/LoiFormServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/StoreTimelineTatServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerOnBoardingPanelController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-rejected.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-req.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-request-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-request.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/monthSales.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/onboarding-timeline-detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/onboarding_timeline.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-history-paginated.vm

Rev 36184 – Fix Credit Note IRN generation for monthly margins - ...

amit — Sat, 04 Apr 2026 13:44:05 +0530

amit – 6 file(s) modified
Fix Credit Note IRN generation for monthly margins

- Add hsnCode to InventoryMarginModel, update 3 named queries to select ii.hsnCode
- Group CN items by taxRate+HSN, set hsnCode on CustomOrderItem
- Add getGenIrnRequest/getItemList overloads in GstProService for credit notes
- Fix IndexOutOfBoundsException from orders-items mismatch in generateCreditNoteIrn
- Wrap fofo and vendor loops in try-catch so one CN failure does not abort the process
- Send summary email with failure details to amit.gupta and ranu.rajput

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/OfferPayout.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/PriceDropIMEI.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/GstProService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/CreditNoteServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/InventoryMarginModel.java

Rev 36152 – Feat:Request Panel for brand dealer registration,Admin panel for managing WOD ...

aman — Thu, 02 Apr 2026 12:13:18 +0530

aman – 19 file(s) modified
Feat:Request Panel for brand dealer registration,Admin panel for managing WOD request templates

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FinServiceDocument.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FinServiceRequest.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FinServiceTemplate.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FinServiceDocumentRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FinServiceDocumentRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FinServiceRequestRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FinServiceRequestRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FinServiceTemplateRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FinServiceTemplateRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/loiForm/LoiFormServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/CreditNoteServiceImpl.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/FinServiceController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/wod-request.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/fin-service
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/fin-service/fin-service-list.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/fin-service/fin-service-panel.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/fin-service/wod-template-edit.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/fin-service/wod-template-list.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm

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 36101 – weekly rating system live on calling module

ranu — Mon, 30 Mar 2026 17:38:58 +0530

ranu – 8 file(s) modified
weekly rating system live on calling module

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/RbmRating.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/RbMRatingModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/RbmBreakLogRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/RbmRatingRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/RbmRatingRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm_call_target.vm

Rev 35997 – Invoice Return: PurchaseReturnOrder entity, ReturnAction DAO enum, receive/refund/reject service, ReturnOrderInfo ...

amit — Sat, 14 Mar 2026 19:31:04 +0530

amit – 10 file(s) modified
Invoice Return: PurchaseReturnOrder entity, ReturnAction DAO enum, receive/refund/reject service, ReturnOrderInfo selectByOrderId

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PurchaseReturnOrder.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/ReturnOrderInfo.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/ReturnAction.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseReturnOrderRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseReturnOrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/ReturnOrderInfoRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/ReturnOrderInfoRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/ReturnServiceImpl.java

Rev 35971 – Feat : Loi 2.0 Enhancement and redesigning

aman — Mon, 09 Mar 2026 19:16:49 +0530

aman – 66 file(s) modified
Feat : Loi 2.0 Enhancement and redesigning

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerVerificationCheckboxes.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/onBoarding/LoiFinanceOption.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/onBoarding/LoiForm.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/onBoarding/LoiFormData.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/AddWalletRequest.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/FullStockPayment.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/StoreTimelinetb.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/dtr/LeadSource.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/dtr/StoreTimeline.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/onBorading/onBoardingFormEnums/FranchiseType.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/onBorading/onBoardingFormEnums/FullStockPaymentStatus.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/DelayReportItem.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/hdfc/LoiFinanceOptionModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PartnerOnBoardingPanelRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PartnerOnBoardingPanelRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PartnerOnboardingVerificationRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/PartnerOnboardingVerificationRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/FullStockPaymentRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/FullStockPaymentRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/LoiFinanceOptionRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/LoiFinanceOptionRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/StoreTimelinetbRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/StoreTimelinetbRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/loiForm/LoiFormServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/StoreTimelineTatService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/StoreTimelineTatServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoiFormController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerOnBoardingPanelController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ServiceConfigContoller.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/loi-form.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/panel-listing.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-dealer-mapping.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/update-retailer-details.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-request-paginated.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-request.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/auto-Loi.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/delay-panel.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/design-completed.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/finance-services.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/full-stock-payment-panel.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/loi-form.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/loiForm/brand-fee-collection.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/loiForm/document-upload.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/onboarding-timeline-detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/onboarding_timeline.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-design-index.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-design-row-index.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-index.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-open.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-reject.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-row-index.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-verification.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-service-deActivate-modal.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-service-modal.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-services.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-verification-checkbox-model.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pendingForm.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/service-not-applicable-by-partner-modal.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/welcome-call-index.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wod-fin-mapping-report.vm

Rev 35961 – Add closed state to FofoStore - permanent store closure with ...

amit — Sat, 07 Mar 2026 13:33:34 +0530

amit – 1 file(s) modified
Add closed state to FofoStore - permanent store closure with store code confirmation. Closed stores cannot be reactivated.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStore.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 35849 – Add serialVersionUID to PartnerDailyInvestment to fix deserialization failure in Partner ...

amit — Wed, 25 Feb 2026 16:52:15 +0530

amit – 1 file(s) modified
Add serialVersionUID to PartnerDailyInvestment to fix deserialization failure in Partner Wise Report

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerDailyInvestment.java

Rev 35848 – Refactor investment logic to use own investment (total - utilized), ...

amit — Wed, 25 Feb 2026 15:32:49 +0530

amit – 16 file(s) modified
Refactor investment logic to use own investment (total - utilized), remove minimumInvestmentOld, add OK_INVESTMENT_SHORT_PERCENTAGE constant, update thresholds CUTOFF_INVESTMENT=10 MIN_INVESTMENT_PERCENTAGE=5

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/InvestmentRelatedTasks.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/CurrentPartnerDailyInvestment.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStore.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerDailyInvestment.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/FofoUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerInvestmentServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerStatsServiceImpl.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-fofo/src/main/java/com/spice/profitmandi/web/controller/PerformanceController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SDCreditController.java

Rev 35833 – Add credit fallback for prebooking: create standard loan (5 free ...

amit — Mon, 23 Feb 2026 18:39:13 +0530

amit – 2 file(s) modified
Add credit fallback for prebooking: create standard loan (5 free days) when wallet insufficient

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PrebookingOrder.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PrebookingServiceImpl.java

Rev 35810 – Show correct return status for non-serialized items in FOFO returnable ...

amit — Fri, 20 Feb 2026 17:01:36 +0530

amit – 3 file(s) modified
Show correct return status for non-serialized items in FOFO returnable details view. Fetch both CREATED and APPROVED PRIs so the UI displays 'Return approved' or 'Return requested' instead of showing the Request Return button again after approval.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PurchaseReturnItem.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/returnable-details.vm

Rev 35652 – PineLabs Offer and Create Order

vikas — Tue, 03 Feb 2026 19:52:20 +0530

vikas – 14 file(s) modified
PineLabs Offer and Create Order

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PinelabsCustomer.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PinelabsOrder.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/Gateway.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/AddAmountToWalletModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PinelabsOrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PinelabsOrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/CCAvenuePaymentService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/pinelabs/dto/CreateOrderResponse.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/pinelabs/PinelabsApiConfig.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/pinelabs/PinelabsOrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/FofoCatalogResponse.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/WalletController.java

Rev 35651 – Fix:Item Wise monthly sale and fofo opening stock minus condition

aman — Tue, 03 Feb 2026 18:29:36 +0530

aman – 2 file(s) modified
Fix:Item Wise monthly sale and fofo opening stock minus condition

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/cart/SmartCartServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrderItem.java

Rev 35648 – code commit for calling target / retailer contact

ranu — Tue, 03 Feb 2026 11:49:16 +0530

ranu – 5 file(s) modified
code commit for calling target / retailer contact

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/RetailerContact.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/RetailerController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-contact-list.vm

Rev 35642 – Fix:Email Service and adhar front and back uploader

aman — Mon, 02 Feb 2026 11:37:51 +0530

aman – 3 file(s) modified
Fix:Email Service and adhar front and back uploader

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/TrialForm.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/TrialServiceImpl.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 35537 – Optimize getAllPartnerStats: combine 5 tertiary queries into 1 using CASE ...

amit — Thu, 08 Jan 2026 23:58:50 +0530

amit – 6 file(s) modified
Optimize getAllPartnerStats: combine 5 tertiary queries into 1 using CASE WHEN pattern

- Added PartnerTertiarySalesModel to hold combined tertiary data
- Added FofoOrder.selectPartnerTertiarySales named query using CASE WHEN
- Added selectPartnerTertiarySales() batch method in FofoOrderItemRepository
- Updated PartnerStatsServiceImpl to use single combined query
- Reduces 5 DB queries to 1 for tertiary sales data (lmtd, mtd, lms, today, last3days)

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrder.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerTertiarySalesModel.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/service/PartnerStatsService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerStatsServiceImpl.java