Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff
36405 4 d 3 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Fix duplicate SchemeInOut on concurrent GRN: SELECT FOR UPDATE on inventory_item before createSchemeInOut to serialise concurrent GRN calls per IMEI  
36397 4 d 6 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.
 
36103 32 d 1 h amit /trunk/profitmandi-dao/src/main/ Add DN rejection with full reversal: restore inventory, schemes, price drops, offers; add deny reason to purchase return items; add purchase return notification service  
36070 36 d 7 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ Premium CD days: add partner-type helpers, update credit terms, fix CD rejection for 20-day loans, update invoice PDF terms  
35895 60 d 23 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ Simplify price handling code: remove dead code, replace System.out with LOGGER, deduplicate priceDiff calc, add comments  
35629 91 d 3 h amit /trunk/ Fixed SchemeService  
35559 106 d 4 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/ Fixed SchemeService  
35493 127 d 22 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ N+1 query optimization for B2B order creation flow

- OrderServiceImpl: Batch fetch PendingOrderItems before validation loop (line 402)
- OrderServiceImpl: Batch update opening stock using minusOpeningStockBatch
- OrderServiceImpl: Pre-fetch tagListings and GST rates before createAndGetFofoOrderItem loop
- OrderServiceImpl: Batch fetch PendingOrderItems for status update (line 719)
- CartServiceImpl: Pre-fetch items before getCartValidation loop
- SchemeServiceImpl: Batch fetch SchemeInOut records in processSchemeOut
- SmartCartService: Added minusOpeningStockBatch method for batch updates
- TagListingRepository: Added selectByItemIds batch method
- FofoOpeningStockRepository: Added findByFofoIdAndCatalogIds batch method
- PendingOrderItemRepository: Added selectByIds batch method

Performance improvement: ~70-100 DB queries reduced per order (10 items avg)
 
35394 135 d 19 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Improved performance  
35334 151 d 9 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/ Fixed hard limit  
35252 178 d 9 h aman /trunk/ Feat:Expire Schemes by ids and lead assign to bgc too  
35236 186 d 3 h amit /trunk/ Fixed notification related issues with scheme also stopped using mongo for brands Schema  
35210 198 d 3 h vikas /trunk/ Push Notifications Templates  
35096 214 d 4 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/ Fixed Static  
35060 219 d 21 h amit /trunk/ Fixed wrong notifications going to retailers  
34991 232 d 5 h vikas /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/ Web Pages Management and Notifications Formatting  
34990 232 d 5 h vikas /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/ Web Pages Management and Notifications Formatting  
34989 232 d 6 h vikas /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/ Web Pages Management and Notifications Formatting  
34962 239 d 5 h vikas /trunk/ Web Pages Management and Notifications Formatting  
34902 252 d 1 h vikas /trunk/ Affiliate Order  
34850 272 d 13 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/ Update  
34803 290 d 1 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/ Fixed scheme out  
34802 290 d 2 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/ Will appropriate the in margin when bill is created  
34800 290 d 3 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/ Fixed credited scheme id  
34778 295 d 7 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Fixed rollout for Pardeep telecom  
34750 301 d 4 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/ Special Support would not get added or rejected from processing scheme out  
34746 302 d 6 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/ donotcommit  
34744 302 d 8 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/ Fi  
34742 303 d 3 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/ Added logic to rollback  
34740 304 d 4 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/ Fixed  
34709 309 d 7 h amit.gupta /trunk/ Added Loan Related Changes  
34708 310 d 1 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/ method update process scheme in out  
34706 310 d 2 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/ Fixed bug related to scheme  
34705 310 d 2 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/ Fixed  
34698 311 d 3 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/ Fixed  
34592 345 d 1 h vikas.jangra /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Combined special Offers  
34586 346 d 2 h vikas.jangra /trunk/ Consolidated Liquidation Report  
34568 351 d 2 h vikas.jangra /trunk/ Liquidation/Bidding push notification and Publish Email  
34504 366 d 9 h amit.gupta /trunk/ Fixed rollback of excess schemes in Oppo  
34503 367 d 4 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/ Commented Schemes In Out