Subversion Repositories SmartDukaan

Rev

Show changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
37089 6 d 13 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/ Optimize partnerPerformance data access: fofoId-scoped + month-bucketed query variants

- Order: fofoId-scoped billing-avg named queries (replace all-partner scan+filter)
- MonthlyTarget: selectByDatesAndFofoId batches 7 per-month lookups into one
- SchemeInOut/OfferPayout: month-bucketed ...ByMonth earnings queries collapsing the
per-month loop; new MonthlyBrandIncomeModel / MonthlyOfferPayoutModel
All additive; existing shared queries and their callers unchanged.
 
37055 10 d 15 h ranu /trunk/ allocation of hid and opening stock suggested qty logic updated as per tarun sir  
37009 17 d 8 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ Fix Selling Price - DP in IMEI drill-down to use actual inventory-item DP

selectLastMonthFrontEndImei (the per-IMEI breakdown behind each brand/model row)
still passed foi.dp (frozen list DP) into LastMonthFrontEndImeiModel, so the
drill-down did not reconcile with the brand/model totals fixed in r37008. Now
uses ii.unitPrice-ii.priceDropAmount, matching selectLastMonthFrontEndByImei.
 
37008 17 d 8 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ Fix Selling Price - DP to use actual inventory-item DP instead of frozen list DP

Brand-wise (selectFrontIncomeByBrand) and model-wise (selectFrontIncomeBrandWise)
front-income queries computed the margin as (foi.sellingPrice - foi.dp), where
foi.dp is the TagListing list price frozen on the sale line at order time. This
produced spurious negative margins (e.g. -6000 for units sold at cost). Now uses
the actual per-IMEI acquisition DP (ii.unitPrice - ii.priceDropAmount), the same
net-DP basis used elsewhere (InventoryItem.getNetPrice / scheme payout calc).
 
37001 18 d 10 h ranu /trunk/ rbm calling target issue fix according to aquil  
36972 19 d 16 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/ changeList  
36920 26 d 11 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/ Remove unused Digify retailer integration (controllers, entity, repository, model, views, JS handler, assets)  
36901 28 d 9 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/ HID requested-allocations: fully batch HID computation (batched tier + SUM(current_qty) + 2-day sales per pair, replacing per-partner query) and add Pending list pagination  
36898 28 d 10 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/ HID allocation: batch the requested-allocations screen (catalog-filtered HID query + batched billed/activated serial lookups) and add approved-list pagination (50/page) reusing GenericRepository paginated+count helpers  
36894 28 d 14 h amit /trunk/profitmandi-dao/src/main/ HID allocation: requested qty is now an additional one-time allowance (purchase-limit override, HID target unchanged); add approved_by column; add 5-day billed/activated serial lookups for the edit screen  
36768 47 d 11 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.
 
36727 53 d 12 h ranu /trunk/ beat plan info commit  
36649 58 d 16 h vikas /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/ Reverted deleted files  
36648 58 d 16 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ delete commit  
36586 63 d 16 h aman /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Fix:Restructure mail send  
36579 64 d 13 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  
36571 65 d 14 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ fix: add transient orderItems list field to FofoOrder for order creation response  
36525 69 d 16 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/ code committed for scheme and offers earning for v2  
36524 70 d 11 h aman /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Fix:Fix first po and edge case for bulk order  
36518 70 d 13 h aman /trunk/ Fix:Fix first po and edge case for bulk order  

Show All