| Line 1033... |
Line 1033... |
| 1033 |
|
1033 |
|
| 1034 |
boolean partnerTypeUpgraded = partnerTypeChangeService.isPartnerTypeUpgraded(loginDetails.getFofoId(), YearMonth.now());
|
1034 |
boolean partnerTypeUpgraded = partnerTypeChangeService.isPartnerTypeUpgraded(loginDetails.getFofoId(), YearMonth.now());
|
| 1035 |
|
1035 |
|
| 1036 |
LOGGER.info("partnerType" + partnerTypeUpgraded);
|
1036 |
LOGGER.info("partnerType" + partnerTypeUpgraded);
|
| 1037 |
|
1037 |
|
| 1038 |
Map<String, Double> categoryUpradeBrandModelMap = null;
|
1038 |
Map<String, Double> categoryUpgradeBrandModelMap = null;
|
| 1039 |
if (partnerTypeUpgraded) {
|
1039 |
if (partnerTypeUpgraded) {
|
| 1040 |
categoryUpradeBrandModelMap = schemeInOutRepository
|
1040 |
categoryUpgradeBrandModelMap = schemeInOutRepository
|
| 1041 |
.selectLastMonthCategoryUpgradeMarginByBrandModel(loginDetails.getFofoId(), brand, monthStart,
|
1041 |
.selectLastMonthCategoryUpgradeMarginByBrandModel(loginDetails.getFofoId(), brand, monthStart,
|
| 1042 |
monthEnd)
|
1042 |
monthEnd)
|
| 1043 |
.stream().collect(Collectors.toMap(x -> x.getBrand(), x -> x.getAmount()));
|
1043 |
.stream().collect(Collectors.toMap(x -> x.getBrand(), x -> x.getAmount()));
|
| 1044 |
}
|
1044 |
}
|
| 1045 |
|
1045 |
|
| Line 1057... |
Line 1057... |
| 1057 |
|
1057 |
|
| 1058 |
Map<Integer, Double> modelTotalIncomeMap = new HashMap<>();
|
1058 |
Map<Integer, Double> modelTotalIncomeMap = new HashMap<>();
|
| 1059 |
Map<Integer, String> modelNameMap = new HashMap<>();
|
1059 |
Map<Integer, String> modelNameMap = new HashMap<>();
|
| 1060 |
|
1060 |
|
| 1061 |
modelWiseSchemeOutMargins.stream().forEach(x -> {
|
1061 |
modelWiseSchemeOutMargins.stream().forEach(x -> {
|
| 1062 |
modelTotalIncomeMap.put(x.getCatalogItemId(), x.getAmount());
|
1062 |
modelTotalIncomeMap.put(x.getCatalogItemId(), x.getAmount() + x.getPendingSaleAmount());
|
| 1063 |
modelNameMap.put(x.getCatalogItemId(), (x.getModelNumber() + x.getModelName()).trim());
|
1063 |
modelNameMap.put(x.getCatalogItemId(), (x.getModelNumber() + " " + x.getModelName()).trim());
|
| 1064 |
|
1064 |
|
| 1065 |
});
|
1065 |
});
|
| - |
|
1066 |
LastMonthBrandWiseIncomeModel totalModel = new LastMonthBrandWiseIncomeModel();
|
| 1066 |
modelWiseSalesMargins.stream().forEach(x -> {
|
1067 |
modelWiseSalesMargins.stream().forEach(x -> {
|
| 1067 |
if (!modelWiseSchemeOutMarginsMap.containsKey(x.getCatalogItemId())) {
|
1068 |
if (!modelWiseSchemeOutMarginsMap.containsKey(x.getCatalogItemId())) {
|
| 1068 |
modelTotalIncomeMap.put(x.getCatalogItemId(), 0d);
|
1069 |
modelTotalIncomeMap.put(x.getCatalogItemId(), 0d);
|
| 1069 |
LastMonthBrandWiseIncomeModel lmbwIncomeModel = new LastMonthBrandWiseIncomeModel();
|
1070 |
LastMonthBrandWiseIncomeModel lmbwIncomeModel = new LastMonthBrandWiseIncomeModel();
|
| 1070 |
lmbwIncomeModel.setAmount(x.getAmount());
|
1071 |
lmbwIncomeModel.setAmount(x.getAmount());
|
| Line 1079... |
Line 1080... |
| 1079 |
|
1080 |
|
| 1080 |
}
|
1081 |
}
|
| 1081 |
LastMonthBrandWiseIncomeModel lmbwIncomeModel = modelWiseSchemeOutMarginsMap.get(x.getCatalogItemId());
|
1082 |
LastMonthBrandWiseIncomeModel lmbwIncomeModel = modelWiseSchemeOutMarginsMap.get(x.getCatalogItemId());
|
| 1082 |
lmbwIncomeModel.setQty(x.getQty());
|
1083 |
lmbwIncomeModel.setQty(x.getQty());
|
| 1083 |
lmbwIncomeModel.setAmount(lmbwIncomeModel.getAmount() + x.getAmount());
|
1084 |
lmbwIncomeModel.setAmount(lmbwIncomeModel.getAmount() + x.getAmount());
|
| 1084 |
modelTotalIncomeMap.put(x.getCatalogItemId(), modelTotalIncomeMap.get(x.getCatalogItemId()) + x.getAmount() + x.getPendingSaleAmount());
|
1085 |
modelTotalIncomeMap.put(x.getCatalogItemId(), modelTotalIncomeMap.get(x.getCatalogItemId()) + x.getAmount());
|
| 1085 |
modelNameMap.put(x.getCatalogItemId(), (x.getModelNumber() + x.getModelName()).trim());
|
1086 |
modelNameMap.put(x.getCatalogItemId(), (x.getModelNumber() + x.getModelName()).trim());
|
| - |
|
1087 |
totalModel.setQty(totalModel.getQty() + x.getQty());
|
| - |
|
1088 |
totalModel.setAmount(totalModel.getAmount() + lmbwIncomeModel.getAmount());
|
| - |
|
1089 |
totalModel.setPendingSaleAmount(totalModel.getPendingSaleAmount());
|
| 1086 |
|
1090 |
|
| 1087 |
});
|
1091 |
});
|
| 1088 |
modelWiseSchemeInMargins.stream().forEach(x -> {
|
1092 |
modelWiseSchemeInMargins.stream().forEach(x -> {
|
| 1089 |
if (!modelTotalIncomeMap.containsKey(x.getCatalogItemId())) {
|
1093 |
if (!modelTotalIncomeMap.containsKey(x.getCatalogItemId())) {
|
| 1090 |
modelTotalIncomeMap.put(x.getCatalogItemId(), 0d);
|
1094 |
modelTotalIncomeMap.put(x.getCatalogItemId(), 0d);
|
| 1091 |
}
|
1095 |
}
|
| 1092 |
modelTotalIncomeMap.put(x.getCatalogItemId(), modelTotalIncomeMap.get(x.getCatalogItemId()) + x.getAmount());
|
1096 |
modelTotalIncomeMap.put(x.getCatalogItemId(), modelTotalIncomeMap.get(x.getCatalogItemId()) + x.getAmount());
|
| 1093 |
modelNameMap.put(x.getCatalogItemId(), (x.getModelNumber() + x.getModelName()).trim());
|
1097 |
modelNameMap.put(x.getCatalogItemId(), (x.getModelNumber() + x.getModelName()).trim());
|
| - |
|
1098 |
totalModel.setQty(totalModel.getQty() + x.getQty());
|
| - |
|
1099 |
totalModel.setAmount(totalModel.getAmount() + x.getAmount());
|
| 1094 |
|
1100 |
|
| 1095 |
});
|
1101 |
});
|
| 1096 |
|
1102 |
|
| 1097 |
model.addAttribute("month", month);
|
1103 |
model.addAttribute("month", month);
|
| 1098 |
model.addAttribute("modelWiseSchemeOutMarginsMap", modelWiseSchemeOutMarginsMap);
|
1104 |
model.addAttribute("modelWiseSchemeOutMarginsMap", modelWiseSchemeOutMarginsMap);
|
| 1099 |
model.addAttribute("modelWiseSchemeInMarginsMap", modelWiseSchemeInMarginsMap);
|
1105 |
model.addAttribute("modelWiseSchemeInMarginsMap", modelWiseSchemeInMarginsMap);
|
| 1100 |
model.addAttribute("modelNameMap", modelNameMap);
|
1106 |
model.addAttribute("modelNameMap", modelNameMap);
|
| 1101 |
model.addAttribute("modelTotalIncomeMap", modelTotalIncomeMap);
|
1107 |
model.addAttribute("modelTotalIncomeMap", modelTotalIncomeMap);
|
| 1102 |
model.addAttribute("categoryUpradeBrandModelMap", categoryUpradeBrandModelMap);
|
1108 |
model.addAttribute("categoryUpgradeBrandModelMap", categoryUpgradeBrandModelMap);
|
| - |
|
1109 |
model.addAttribute("totalModel", totalModel);
|
| 1103 |
|
1110 |
|
| 1104 |
return "montly-brand-wise-income";
|
1111 |
return "montly-brand-wise-income";
|
| 1105 |
|
1112 |
|
| 1106 |
}
|
1113 |
}
|
| 1107 |
|
1114 |
|