Subversion Repositories SmartDukaan

Rev

Show changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
37083 12 m amit /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ Wire noon price-drop cron to per-drop batch (PriceDropBatchService)

@Scheduled("0 0 12") now delegates to
BatchScheduledTasks.reprocessPriceDropsWithBatch() -> PriceDropBatchService,
so each price drop commits in its own REQUIRES_NEW transaction instead of one
~20-min transaction holding user_wallet locks and timing out live
wallet/order/scan traffic at noon.

Requires profitmandi-dao PriceDropBatchService / PriceDropProcessingHelper.
 
37082 12 m 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.
 
37081 33 m ranu /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ old version app disabled for rbm  
37080 33 m amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/biuedart/ T16: split ShippingRequest.java into one-class-per-file (Services/Request/Consignee/ReturnAddress/Commodity/Dimension/ItemDetail/Shipper/Profile) to fix intermittent gradle incremental 'cannot find symbol Services/Request' Bluedart build failures; no logic change  
37079 1 h 1 m ranu /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ old version app disabled for rbm  
37078 1 h 3 m ranu /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ old version app disabled for rbm  
37077 2 h 33 m ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/ old version app disabled for rbm  
37076 2 h 38 m vikas /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Added leave option on UnScheduled/Not Started/Agenda Missing  
37075 2 h 51 m ranu /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ old version app disabled for rbm  
37074 3 h 49 m amit /trunk/profitmandi-dao/src/main/resources/sql/ Add T3.1 re-tag SQL: manual scheme-reversal legs ADDITIONAL_SCHEME -> OTHERS

One-time reconciliation applied to hadb1: 19 manual scheme/incentive clawback
wallet legs (Rs 2,25,110) whose offer_payout was never rejected (MARGINS CN still
stands) were re-tagged ADDITIONAL_SCHEME -> OTHERS so the account-statement
scheme-adjustment line nets out. Money unchanged (reference_type + description
only). Includes backup + verify + rollback. Backup table
transaction._bak_addl_scheme_others_20260710.
 
37073 18 h 17 m vikas /trunk/ Leave Email Notification to HR  
37072 19 h 28 m amit /trunk/profitmandi-fofo/src/main/ PO creation: alert on missing approved vendor price + JS version bump 378 (T10); POST whitespace sanitizer deserializer + VendorController search fix (T9.5)  
37071 19 h 29 m amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Normalize whitespace on Catalog/Item setters + ItemLoaderService bulk upload (T9.5 sanitizer)  
37070 19 h 29 m amit /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ Add StringUtils.normalizeWhitespace for input whitespace normalization (T9.5 sanitizer dependency)  
37069 20 h 35 m vikas /trunk/profitmandi-web/src/main/ Added revisit option  
37068 21 h 52 m amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/ processSchemeOut: resolve OUT schemes on order create date, not GRN billing date

OUT schemes (sellout, special support, category, hygiene) are earned at the
sale event, so scheme eligibility must be pulled on fofoOrder.createTimestamp,
not each IMEI's GRN billing date. Reverts the r36397 date-basis change (which
pinned OUT to GRN date to 'align with IN behaviour' - but IN and OUT are
different events). The scheme_item date-windowing feature from r36397 is kept
intact; only the lookup date reverts to the order create timestamp.
 
37067 3 d 17 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/ Fix null state code on FOFO partner-to-customer sale-return credit note: populate partner/customer address state codes via StateRepository lookup (were unset)  
37066 3 d 18 h amit /trunk/profitmandi-common/ Modular invoice/note PDF generation: extract DocumentRenderer + reusable sections + two-axis tax abstraction out of PdfUtils (now thin shims); folded per-tax invoice columns; note Invoice-Ref + type detection; golden-image test harness  
37065 3 d 19 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Block scheme/CN-backed reference types from the wallet bulk-upload sheet

Manual scheme/incentive clawbacks posted from /wallet/upload as ADDITIONAL_SCHEME
(or any CN_WALLET_REFERENCES type) leave the offer_payout un-rejected, so the
month-end MARGINS credit note is over-issued and the account-statement
scheme-adjustment line breaks. Pre-validate the whole sheet and reject up-front;
manual scheme recoveries must be posted as OTHERS.
 
37064 3 d 20 h ranu /trunk/profitmandi-fofo/src/main/ edit lead on bgc can schedule  

Show All