Subversion Repositories SmartDukaan

Rev

Rev 32194 | Rev 32383 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 32194 Rev 32298
Line 174... Line 174...
174
    public String verifyVendorCatalogPricingRequest(HttpServletRequest request, @RequestParam int id, @RequestParam VendorCatalogPricingStatus status, Model model) throws Exception {
174
    public String verifyVendorCatalogPricingRequest(HttpServletRequest request, @RequestParam int id, @RequestParam VendorCatalogPricingStatus status, Model model) throws Exception {
175
        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
175
        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
176
        AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
176
        AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
177
 
177
 
178
        VendorCatalogPricingLog vendorCatalogPricingLog = vendorCatalogPricingLogRepository.selectById(id);
178
        VendorCatalogPricingLog vendorCatalogPricingLog = vendorCatalogPricingLogRepository.selectById(id);
-
 
179
 
-
 
180
        if (status.equals(VendorCatalogPricingStatus.APPROVED)) {
-
 
181
            List<VendorPriceCircularModel> vendorCatalogPricing = vendorCatalogPricingLogRepository.selectVendorPricingByEffectedDateAndCatalogId(vendorCatalogPricingLog.getVendorId(), vendorCatalogPricingLog.getEffectedOn(), vendorCatalogPricingLog.getCatalogId());
-
 
182
            if (!vendorCatalogPricing.isEmpty()) {
-
 
183
 
-
 
184
                VendorCatalogPricingLog vendorCatalog = vendorCatalogPricingLogRepository.selectById(vendorCatalogPricing.get(0).getId());
-
 
185
                vendorCatalog.setStatus(VendorCatalogPricingStatus.REJECTED);
-
 
186
                vendorCatalog.setUpdatedTimestamp(LocalDateTime.now());
-
 
187
 
-
 
188
 
-
 
189
            }
-
 
190
        }
179
        vendorCatalogPricingLog.setStatus(status);
191
        vendorCatalogPricingLog.setStatus(status);
180
        vendorCatalogPricingLog.setUpdatedTimestamp(LocalDateTime.now());
192
        vendorCatalogPricingLog.setUpdatedTimestamp(LocalDateTime.now());
181
        if (vendorCatalogPricingLog.getStatus().equals(VendorCatalogPricingStatus.APPROVED)) {
193
        if (vendorCatalogPricingLog.getStatus().equals(VendorCatalogPricingStatus.APPROVED)) {
182
            vendorCatalogPricingLog.setApprovedBy(authUser.getId());
194
            vendorCatalogPricingLog.setApprovedBy(authUser.getId());
183
            vendorCatalogPricingLog.setApprovedTimestamp(LocalDateTime.now());
195
            vendorCatalogPricingLog.setApprovedTimestamp(LocalDateTime.now());
Line 230... Line 242...
230
        return "response";
242
        return "response";
231
 
243
 
232
    }
244
    }
233
 
245
 
234
    @RequestMapping(value = "/vendorItem", method = RequestMethod.GET)
246
    @RequestMapping(value = "/vendorItem", method = RequestMethod.GET)
235
    public String getItemPricing(HttpServletRequest request,  Model model,@RequestParam int vendorId, @RequestParam String query) throws Throwable {
247
    public String getItemPricing(HttpServletRequest request, Model model, @RequestParam int vendorId, @RequestParam String query) throws Throwable {
236
        String query1 = query.toLowerCase();
248
        String query1 = query.toLowerCase();
237
 
249
 
238
        List<ItemDescriptionModel> partnersItemDescription = warehouseService.getAllPartnerItemStringDescription(vendorId).parallelStream().filter(x -> x.getItemDescription().toLowerCase().matches(".*?" + query1 + ".*?")).collect(Collectors.toList());
250
        List<ItemDescriptionModel> partnersItemDescription = warehouseService.getAllPartnerItemStringDescription(vendorId).parallelStream().filter(x -> x.getItemDescription().toLowerCase().matches(".*?" + query1 + ".*?")).collect(Collectors.toList());
239
        LOGGER.info("partnersItemDescription" + partnersItemDescription);
251
        LOGGER.info("partnersItemDescription" + partnersItemDescription);
240
 
252