Subversion Repositories SmartDukaan

Rev

Show changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
36768 43 d 20 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/ Restore ActivatedImei.checked idempotency guard (revert r36579)

r36579 removed the 'ai.checked = false' filter from selectMissedActivationSale
and dropped the checked field, treating it as dead. It was not: the filter
prevented the daily activation-scheme sweep from re-processing the ~163K
already-evaluated historical activations (checked=1). Without it, the sweep
resurrected those old activations as PENDING scheme_in_out rows, and the
oldest ones (whose legacy orders have no fofo_order) made processActivation
throw FFORDR_1000 and roll back the entire batch every run since 2026-05-18,
stalling all special-support credits.

Restores the checked field + accessors and the 'ai.checked = false' filter.
checked column repopulated on fofo.activated_imei from backup; rogue PENDING
rows cleaned up separately.
 
36579 60 d 23 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/ Remove unused checked flag from ActivatedImei; remove dead ai.checked=false filter from selectMissedActivationSale query  
36451 75 d 21 h amit /trunk/profitmandi-dao/src/main/ Add reference field to catalog.offer and catalog.scheme for payout collation  
36397 81 d 0 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ 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.
 
36374 83 d 23 h ranu /trunk/ schemes and offer for v2 version  
35099 289 d 23 h amit /trunk/ Fixed dashboard  
34752 377 d 15 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Fixed Activation Scheme Logic  
34697 387 d 21 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/ Fixed  
32310 1075 d 16 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/ Fixe  
31860 1175 d 0 h tejbeer /trunk/ change  
31698 1224 d 23 h tejbeer /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/  
31696 1224 d 23 h tejbeer /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/  
31695 1224 d 23 h tejbeer /trunk/  
31657 1233 d 15 h tejbeer /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/  
31652 1233 d 16 h tejbeer /trunk/  
31651 1233 d 16 h tejbeer /trunk/ change  
31441 1280 d 23 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/ Added logic to handle zip download  
31170 1336 d 21 h amit.gupta /trunk/ Fixed Duplicate imeis while rolling out additional schemes and Added Region wise schemes  
30896 1418 d 20 h amit.gupta /trunk/ Added Logic to automate schemes  
30640 1492 d 21 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/ Added isWithinRange method to Scheme.java  
30454 1518 d 0 h amit.gupta /trunk/ Fixed scheme issue  
30121 1594 d 22 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Fixed scheme issue  
28653 1823 d 2 h amit.gupta /trunk/ Added Changes to order creation  
27388 2069 d 3 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/  
26685 2245 d 12 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/  
26679 2245 d 20 h amit.gupta /trunk/ Added Scheme  
25503 2505 d 8 h amit.gupta /trunk/  
24402 2754 d 2 h amit.gupta /trunk/ Fixed date formatting  
23914 2921 d 21 h govind /trunk/ Extend EndDate Scheme by All and by schemeId.
Delete ItemId by SchemeId.
Add ItemId to SchemeId.
change dateRangePicker.
Create Scheme With Multiple Brand and Multiple Items.
 
23527 3024 d 1 h ashik.ali /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Feature : Recharge Commission, some improvements, recharge live integration  
23418 3047 d 23 h ashik.ali /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ New feature: Prebooking Listing, Prebooking Orders, link with orders, order details  
23339 3082 d 23 h ashik.ali /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Bug fixed  
23297 3088 d 23 h ashik.ali /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/  
23019 3144 d 2 h ashik.ali /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/  
22859 3173 d 22 h ashik.ali /trunk/profitmandi-dao/  
22702 3193 d 1 h ashik.ali /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/  
22653 3196 d 20 h ashik.ali /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/  
22608 3200 d 23 h ashik.ali /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/  
22600 3201 d 20 h ashik.ali /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/