Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff
37030 10 d 0 h amit /trunk/profitmandi-dao/src/main/ Add credit block/unblock audit log (dao): CreditBlockLog entity/enum/repo + blockCredit/unblockCredit/getCreditBlockLogs service methods  
36958 16 d 23 h amit /trunk/profitmandi-dao/src/main/ Flagship credit: fire interest-free limits at billing + per-IMEI conversion

- createLoanForBilling now detects flagship lines inside the billing transaction (fixes the
REQUIRES_NEW visibility bug where flagship detection re-queried uncommitted invoice_number and
never fired). Creates one combined flagship limit (is_flagship=1, limit_block=1, 30-day deadline)
plus one transaction.loan_imei row per device.
- convertFlagshipOnSale / IMEI activation now convert only the sold device's slice (matched by IMEI),
so same-model siblings and other billing tranches keep their interest-free window; full convert at
30-day expiry. Lock order aligned (loan -> loan_imei) to avoid sale/expiry deadlock.
- New transaction.loan_imei table + LoanImei entity/repository (migration_loan_imei_table.sql).
- selectAllLoansByInvoice: PurchaseReturn now settles BOTH the real loan and the flagship limit on a
flagship-invoice return (prevents credit leak from a stranded limit).
- Cap guard (flagship credit never exceeds amount drawn) and robust limit settlement (paisa threshold
instead of exact float equality).
 
36578 61 d 0 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Flagship credit: fix sale conversion to use invoice reference, add IMEI activation trigger

- Sale flow: removed unnecessary model_flagship table lookup at sale time. The flagship loan's invoice number already links to the purchase orders, making the date-based check redundant and incorrect (would miss conversions if flagship entry removed after billing).
- IMEI activation: added flagship conversion in addActivatedImeis() for newly activated serials. Groups by partner, checks flagship limits, converts via invoice matching. Covers Samsung/Vivo/Oppo/Realme activation crons and manual UI uploads.
- Repository: added date-parameterized selectActiveFlagshipCatalogIds(catalogIds, asOfDate) overload for future use. Existing method delegates with LocalDate.now().
 
36562 62 d 1 h amit /trunk/profitmandi-dao/src/main/ Flagship credit: date-wise model_flagship table, sale-time conversion with pessimistic locking, batch queries, extracted doConvertFlagshipToLoan helper, removed Catalog.isFlagship  
36560 62 d 2 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Flagship credit: sale-time conversion with FOR UPDATE locking and performance optimizations

- convertFlagshipOnSale: partial conversion at billed price when retailer sells flagship stock
- hasActiveFlagshipLimits: cheap COUNT check to skip catalog lookup for non-flagship partners
- selectActiveFlagshipLimitBlocksForUpdate: pessimistic lock prevents double-conversion from concurrent sales/cron
- selectFlagshipLoansForConversion: added FOR UPDATE lock for cron expiry path
- Batch order fetch instead of per-limit queries
- Wired into OrderServiceImpl.createOrder after stock update
 
36557 62 d 9 h amit /trunk/ feat: Flagship Credit - 30 interest-free days for flagship models with billing split, expiry conversion, API-driven T&C  
35955 132 d 2 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/ Add increaseBlockedLimit for negative price drop: increase credit limit for SD Credit orders, fundWallet fallback for wallet orders  
35878 139 d 20 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/ Remove duplicate getDefaultLoanWithoutLimit (alias of getDefaultLoans), consolidate fundWallet to use single code path  
35848 141 d 23 h amit /trunk/ 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  
35823 145 d 22 h amit /trunk/ Allow overdue partners with fresh money to order via SD Credit on cart page  
35811 146 d 16 h amit /trunk/ Centralize credit/loan summary: CreditSummary DTO, bulk query, fix stale utilization, re-enable overdue check, fix interestPaid bug, optimize fresh money (3 queries vs 21), remove dead code  
35394 212 d 13 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Improved performance  
35316 234 d 18 h ranu /trunk/ loan data showing  
35295 242 d 0 h amit /trunk/ Added reset logic  
35157 281 d 1 h amit /trunk/ Fixed SD Credit HardLimit Check  
35145 282 d 21 h amit /trunk/ Now minimum investment is changed dynamically based on total investment and limit utilized for retailers whose credit is marked as hard limit.  
35131 283 d 21 h amit /trunk/ Fixed hardlimit Logic  
35110 285 d 23 h ranu /trunk/ due date cross added all active loan and change title this mail  
34731 383 d 19 h amit.gupta /trunk/ Fixed Loan Limit Releasing  
34727 384 d 1 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/ config  
34661 400 d 3 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ sd Credit free days set 0 update method  
34453 450 d 19 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Added Loan  
34312 486 d 0 h ranu /trunk/ code committed for loan maping  
34288 493 d 20 h ranu /trunk/ code commit for franchisee visit and rbm ratings  
33903 624 d 22 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Reset hard limits  
33900 626 d 0 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/ Added changes  
33696 693 d 4 h amit.gupta /trunk/ Added changes related to Narration and fixing loan creation while billing  
33663 704 d 0 h amit.gupta /trunk/ Added Loan related improvements  
33419 775 d 22 h amit.gupta /trunk/ Changes related to order  
33339 799 d 22 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/ Fixed SDCreditService  
33297 807 d 17 h amit.gupta /trunk/ Added logic to fund to wallet in case wallet is negative  
32822 918 d 19 h ranu /trunk/ get alert for loan  
32172 1114 d 0 h jai.hind /trunk/ Added Loan summary details  
32171 1114 d 3 h jai.hind /trunk/ Loan summary reversed  
32170 1116 d 1 h jai.hind /trunk/ Loan summary  
31518 1261 d 22 h amit.gupta /trunk/ Fixed compilation error on ScheduledTasks.java  
31399 1290 d 1 h tejbeer /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/  
31110 1356 d 23 h tejbeer /trunk/ change  
31020 1376 d 16 h tejbeer /trunk/ loan hold change  
30936 1406 d 23 h tejbeer /trunk/ change