| Line 895... |
Line 895... |
| 895 |
}
|
895 |
}
|
| 896 |
totalAmountMap.put(brand, totalAmountMap.get(brand) + amount);
|
896 |
totalAmountMap.put(brand, totalAmountMap.get(brand) + amount);
|
| 897 |
|
897 |
|
| 898 |
});
|
898 |
});
|
| 899 |
|
899 |
|
| - |
|
900 |
|
| 900 |
Map<Integer, String> monthValueMap = new HashMap<>();
|
901 |
Map<Integer, String> monthValueMap = new HashMap<>();
|
| 901 |
for (int i = 0; i <= 5; i++) {
|
902 |
for (int i = 0; i <= 5; i++) {
|
| 902 |
LocalDateTime startOfMonth = LocalDateTime.now().withDayOfMonth(1).minusMonths(i);
|
903 |
LocalDateTime startOfMonth = LocalDateTime.now().withDayOfMonth(1).minusMonths(i);
|
| 903 |
monthValueMap.put(i, startOfMonth.format(DateTimeFormatter.ofPattern("MMM''uu")));
|
904 |
monthValueMap.put(i, startOfMonth.format(DateTimeFormatter.ofPattern("MMM''uu")));
|
| 904 |
}
|
905 |
}
|
| Line 1144... |
Line 1145... |
| 1144 |
|
1145 |
|
| 1145 |
});
|
1146 |
});
|
| 1146 |
LastMonthBrandWiseIncomeModel totalModel = new LastMonthBrandWiseIncomeModel();
|
1147 |
LastMonthBrandWiseIncomeModel totalModel = new LastMonthBrandWiseIncomeModel();
|
| 1147 |
modelWiseSalesMargins.stream().forEach(x -> {
|
1148 |
modelWiseSalesMargins.stream().forEach(x -> {
|
| 1148 |
if (!modelWiseSchemeOutMarginsMap.containsKey(x.getCatalogItemId())) {
|
1149 |
if (!modelWiseSchemeOutMarginsMap.containsKey(x.getCatalogItemId())) {
|
| 1149 |
modelTotalIncomeMap.put(x.getCatalogItemId(), 0d);
|
- |
|
| 1150 |
LastMonthBrandWiseIncomeModel lmbwIncomeModel = new LastMonthBrandWiseIncomeModel();
|
1150 |
LastMonthBrandWiseIncomeModel lmbwIncomeModel = new LastMonthBrandWiseIncomeModel();
|
| 1151 |
lmbwIncomeModel.setAmount(x.getAmount());
|
- |
|
| 1152 |
lmbwIncomeModel.setModelName(x.getModelName());
|
1151 |
lmbwIncomeModel.setModelName(x.getModelName());
|
| 1153 |
lmbwIncomeModel.setModelNumber(x.getModelNumber());
|
1152 |
lmbwIncomeModel.setModelNumber(x.getModelNumber());
|
| 1154 |
lmbwIncomeModel.setBrand(x.getBrand());
|
1153 |
lmbwIncomeModel.setBrand(x.getBrand());
|
| 1155 |
lmbwIncomeModel.setCatalogItemId(x.getCatalogItemId());
|
1154 |
lmbwIncomeModel.setCatalogItemId(x.getCatalogItemId());
|
| 1156 |
lmbwIncomeModel.setPendingSaleAmount(x.getPendingSaleAmount());
|
- |
|
| 1157 |
lmbwIncomeModel.setQty(x.getQty());
|
- |
|
| 1158 |
lmbwIncomeModel.setStatus(SchemePayoutStatus.CREDITED);
|
1155 |
lmbwIncomeModel.setStatus(SchemePayoutStatus.CREDITED);
|
| 1159 |
modelWiseSchemeOutMarginsMap.put(x.getCatalogItemId(), lmbwIncomeModel);
|
1156 |
modelWiseSchemeOutMarginsMap.put(x.getCatalogItemId(), lmbwIncomeModel);
|
| 1160 |
|
- |
|
| 1161 |
}
|
1157 |
}
|
| 1162 |
LastMonthBrandWiseIncomeModel lmbwIncomeModel = modelWiseSchemeOutMarginsMap.get(x.getCatalogItemId());
|
1158 |
LastMonthBrandWiseIncomeModel lmbwIncomeModel = modelWiseSchemeOutMarginsMap.get(x.getCatalogItemId());
|
| 1163 |
lmbwIncomeModel.setQty(x.getQty());
|
1159 |
lmbwIncomeModel.setQty(lmbwIncomeModel.getQty() + x.getQty());
|
| 1164 |
lmbwIncomeModel.setAmount(lmbwIncomeModel.getAmount() + x.getAmount());
|
1160 |
lmbwIncomeModel.setAmount(lmbwIncomeModel.getAmount() + x.getAmount());
|
| 1165 |
modelTotalIncomeMap.put(x.getCatalogItemId(),
|
1161 |
modelTotalIncomeMap.put(x.getCatalogItemId(),
|
| 1166 |
modelTotalIncomeMap.get(x.getCatalogItemId()) + x.getAmount());
|
1162 |
modelTotalIncomeMap.get(x.getCatalogItemId()) + x.getAmount());
|
| 1167 |
modelNameMap.put(x.getCatalogItemId(), (x.getModelNumber() + x.getModelName()).trim());
|
1163 |
modelNameMap.put(x.getCatalogItemId(), (x.getModelNumber() + x.getModelName()).trim());
|
| 1168 |
totalModel.setQty(totalModel.getQty() + x.getQty());
|
1164 |
totalModel.setQty(totalModel.getQty() + x.getQty());
|