| Line 171... |
Line 171... |
| 171 |
AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
|
171 |
AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
|
| 172 |
|
172 |
|
| 173 |
VendorCatalogPricingLog vendorCatalogPricingLog = vendorCatalogPricingLogRepository.selectById(id);
|
173 |
VendorCatalogPricingLog vendorCatalogPricingLog = vendorCatalogPricingLogRepository.selectById(id);
|
| 174 |
|
174 |
|
| 175 |
if (status.equals(VendorCatalogPricingStatus.APPROVED)) {
|
175 |
if (status.equals(VendorCatalogPricingStatus.APPROVED)) {
|
| 176 |
List<VendorPriceCircularModel> vendorCatalogPricing = vendorCatalogPricingLogRepository.selectVendorPricingByEffectedDateAndCatalogId(vendorCatalogPricingLog.getVendorId(), vendorCatalogPricingLog.getEffectedOn(), vendorCatalogPricingLog.getCatalogId());
|
176 |
VendorPriceCircularModel vendorPriceCircularModel = vendorCatalogPricingLogRepository
|
| - |
|
177 |
.getVendorPriceOnDate(vendorCatalogPricingLog.getVendorId(), vendorCatalogPricingLog.getCatalogId(), vendorCatalogPricingLog.getEffectedOn());
|
| 177 |
if (!vendorCatalogPricing.isEmpty()) {
|
178 |
if (vendorPriceCircularModel != null) {
|
| 178 |
|
- |
|
| 179 |
VendorCatalogPricingLog vendorCatalog = vendorCatalogPricingLogRepository.selectById(vendorCatalogPricing.get(0).getId());
|
179 |
VendorCatalogPricingLog vendorCatalog = vendorCatalogPricingLogRepository.selectById(vendorPriceCircularModel.getId());
|
| 180 |
vendorCatalog.setStatus(VendorCatalogPricingStatus.REJECTED);
|
180 |
vendorCatalog.setStatus(VendorCatalogPricingStatus.REJECTED);
|
| 181 |
vendorCatalog.setUpdatedTimestamp(LocalDateTime.now());
|
181 |
vendorCatalog.setUpdatedTimestamp(LocalDateTime.now());
|
| 182 |
|
- |
|
| 183 |
|
- |
|
| 184 |
}
|
182 |
}
|
| 185 |
}
|
183 |
}
|
| 186 |
vendorCatalogPricingLog.setStatus(status);
|
184 |
vendorCatalogPricingLog.setStatus(status);
|
| 187 |
vendorCatalogPricingLog.setUpdatedTimestamp(LocalDateTime.now());
|
185 |
vendorCatalogPricingLog.setUpdatedTimestamp(LocalDateTime.now());
|
| 188 |
if (vendorCatalogPricingLog.getStatus().equals(VendorCatalogPricingStatus.APPROVED)) {
|
186 |
if (vendorCatalogPricingLog.getStatus().equals(VendorCatalogPricingStatus.APPROVED)) {
|
| Line 190... |
Line 188... |
| 190 |
vendorCatalogPricingLog.setApprovedTimestamp(LocalDateTime.now());
|
188 |
vendorCatalogPricingLog.setApprovedTimestamp(LocalDateTime.now());
|
| 191 |
vendorCatalogPricingService.createVendorCatalogPricing(vendorCatalogPricingLog);
|
189 |
vendorCatalogPricingService.createVendorCatalogPricing(vendorCatalogPricingLog);
|
| 192 |
}
|
190 |
}
|
| 193 |
|
191 |
|
| 194 |
model.addAttribute("response1", mvcResponseSender.createResponseString(true));
|
192 |
model.addAttribute("response1", mvcResponseSender.createResponseString(true));
|
| 195 |
|
- |
|
| 196 |
return "response";
|
193 |
return "response";
|
| 197 |
|
- |
|
| 198 |
}
|
194 |
}
|
| 199 |
|
195 |
|
| 200 |
|
196 |
|
| 201 |
@RequestMapping(value = "/vendorPriceCircular", method = RequestMethod.GET)
|
197 |
@RequestMapping(value = "/vendorPriceCircular", method = RequestMethod.GET)
|
| 202 |
public String vendorPriceCircular(HttpServletRequest request, Model model) throws Exception {
|
198 |
public String vendorPriceCircular(HttpServletRequest request, Model model) throws Exception {
|
| Line 208... |
Line 204... |
| 208 |
|
204 |
|
| 209 |
|
205 |
|
| 210 |
@RequestMapping(value = "/getVendorPriceCircular", method = RequestMethod.GET)
|
206 |
@RequestMapping(value = "/getVendorPriceCircular", method = RequestMethod.GET)
|
| 211 |
public String getVendorPriceCircular(HttpServletRequest request, @RequestParam int vendorId, @RequestParam LocalDate effectedDate, Model model) throws Exception {
|
207 |
public String getVendorPriceCircular(HttpServletRequest request, @RequestParam int vendorId, @RequestParam LocalDate effectedDate, Model model) throws Exception {
|
| 212 |
|
208 |
|
| 213 |
List<VendorPriceCircularModel> vendorCatalogPricings = vendorCatalogPricingLogRepository.selectByVendorAndEffectedDate(vendorId, effectedDate);
|
209 |
List<VendorPriceCircularModel> vendorCatalogPricings = vendorCatalogPricingLogRepository.getVendorPricesOnDate(vendorId, effectedDate);
|
| 214 |
|
210 |
|
| 215 |
if (!vendorCatalogPricings.isEmpty()) {
|
211 |
if (!vendorCatalogPricings.isEmpty()) {
|
| 216 |
Set<Integer> catalogIds = vendorCatalogPricings.stream().map(x -> x.getCatalogId()).collect(Collectors.toSet());
|
212 |
Set<Integer> catalogIds = vendorCatalogPricings.stream().map(x -> x.getCatalogId()).collect(Collectors.toSet());
|
| 217 |
Map<Integer, List<Item>> itemMap = itemRepository.selectAllByCatalogIds(catalogIds).stream().collect(Collectors.groupingBy(x -> x.getCatalogItemId()));
|
213 |
Map<Integer, List<Item>> itemMap = itemRepository.selectAllByCatalogIds(catalogIds).stream().collect(Collectors.groupingBy(x -> x.getCatalogItemId()));
|
| 218 |
model.addAttribute("itemMap", itemMap);
|
214 |
model.addAttribute("itemMap", itemMap);
|