| Rev |
Age |
Author |
Path |
Log message |
Diff |
| 37089 |
8 d 4 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. |
|
| 37009 |
18 d 23 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 |
18 d 23 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). |
|
| 36525 |
71 d 6 h |
ranu |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/ |
code committed for scheme and offers earning for v2 |
|
| 36508 |
73 d 17 h |
ranu |
/trunk/ |
code committed for scheme and offers earning for v2 |
|
| 36489 |
76 d 1 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/ |
Fix NULL handling in CN query NOT clause — reject/rollback IS NOT NULL guard prevents SQL three-valued logic from excluding valid rows |
|
| 36485 |
76 d 3 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/ |
Fix credit note queries: exclude same-period create+reject rows, replace BETWEEN with >= <= for performance, fix AND/OR precedence bug in SchemeInOut |
|
| 36184 |
109 d 5 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ |
Fix Credit Note IRN generation for monthly margins
- Add hsnCode to InventoryMarginModel, update 3 named queries to select ii.hsnCode
- Group CN items by taxRate+HSN, set hsnCode on CustomOrderItem
- Add getGenIrnRequest/getItemList overloads in GstProService for credit notes
- Fix IndexOutOfBoundsException from orders-items mismatch in generateCreditNoteIrn
- Wrap fofo and vendor loops in try-catch so one CN failure does not abort the process
- Send summary email with failure details to amit.gupta and ranu.rajput |
|
| 35378 |
222 d 0 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ |
Fixed DP its now purchase - price drop |
|
| 34434 |
460 d 23 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/ |
Fixed Scheme In Out |
|
| 34410 |
467 d 2 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/ |
Fixed logic for Scheme in out |
|
| 34407 |
468 d 0 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ |
config |
|
| 34256 |
506 d 8 h |
ranu |
/trunk/ |
hid live and cn attachement part live |
|
| 33459 |
761 d 23 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ |
Fixed changes regarding credit issue |
|
| 33376 |
798 d 1 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ |
Fixed issues related to margin |
|
| 33375 |
798 d 1 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ |
Fixed Order quantity availability |
|
| 32237 |
1092 d 2 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ |
Fixed additional scheme logic |
|
| 32071 |
1149 d 23 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ |
Fixed logic for Smartdukaan Bags |
|
| 31903 |
1174 d 7 h |
amit.gupta |
/trunk/ |
Added changes related to new scheme rollout policy |
|
| 31860 |
1180 d 4 h |
tejbeer |
/trunk/ |
change |
|
| 31380 |
1297 d 5 h |
amit.gupta |
/trunk/ |
Added income calculator |
|
| 31286 |
1313 d 3 h |
amit.gupta |
/trunk/ |
Removed unwanted files |
|
| 31281 |
1314 d 0 h |
amit.gupta |
/trunk/ |
Fixed config and margin calculations |
|
| 31008 |
1384 d 22 h |
amit.gupta |
/trunk/ |
Added CreditNote changes |
|
| 30243 |
1575 d 5 h |
tejbeer |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ |
|
|
| 30050 |
1614 d 4 h |
manish |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ |
commit |
|
| 29927 |
1635 d 8 h |
amit.gupta |
/trunk/ |
Added notifications for pricedrop and price change |
|
| 29926 |
1637 d 1 h |
amit.gupta |
/trunk/ |
Added changes related to price change |
|
| 29578 |
1713 d 6 h |
tejbeer |
/trunk/ |
activation related change |
|
| 27381 |
2079 d 8 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ |
|
|
| 27377 |
2080 d 0 h |
amit.gupta |
/trunk/ |
Added Activation Scheme Logic |
|
| 24671 |
2693 d 5 h |
amit.gupta |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ |
|
|
| 24592 |
2701 d 17 h |
amit.gupta |
/trunk/ |
Added dry run for scheme out |
|
| 23968 |
2913 d 3 h |
amit.gupta |
/trunk/ |
Fixed price drop |
|
| 23527 |
3029 d 5 h |
ashik.ali |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ |
Feature : Recharge Commission, some improvements, recharge live integration |
|
| 23509 |
3030 d 11 h |
amit.gupta |
/trunk/ |
Checking in Returns and added cron like behaviour to profitmandi |
|
| 23345 |
3082 d 8 h |
ashik.ali |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ |
|
|
| 23339 |
3088 d 3 h |
ashik.ali |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ |
Bug fixed |
|
| 23297 |
3094 d 3 h |
ashik.ali |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ |
|
|
| 22859 |
3179 d 2 h |
ashik.ali |
/trunk/profitmandi-dao/ |
|
|