Subversion Repositories SmartDukaan

Rev

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

Rev 32488 Rev 32785
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
            VendorPriceCircularModel vendorPriceCircularModel = vendorCatalogPricingLogRepository
176
            List<VendorCatalogPricingLog> vendorCatalogPricingLogsOnEffectedDate = vendorCatalogPricingLogRepository.selectByEffectedDateAndCatalogId(vendorCatalogPricingLog.getVendorId(), vendorCatalogPricingLog.getCatalogId(), vendorCatalogPricingLog.getEffectedOn());
177
                    .getVendorPriceOnDate(vendorCatalogPricingLog.getVendorId(), vendorCatalogPricingLog.getCatalogId(), vendorCatalogPricingLog.getEffectedOn());
177
            VendorCatalogPricingLog approvedLog = vendorCatalogPricingLogsOnEffectedDate.stream().filter(x -> x.getStatus().equals(VendorCatalogPricingStatus.APPROVED)).findAny().orElseGet(null);
178
            if (vendorPriceCircularModel != null) {
178
            if (approvedLog != null) {
179
                VendorCatalogPricingLog vendorCatalog = vendorCatalogPricingLogRepository.selectById(vendorPriceCircularModel.getId());
-
 
180
                vendorCatalog.setStatus(VendorCatalogPricingStatus.REJECTED);
179
                approvedLog.setStatus(VendorCatalogPricingStatus.REJECTED);
181
                vendorCatalog.setUpdatedTimestamp(LocalDateTime.now());
180
                approvedLog.setUpdatedTimestamp(LocalDateTime.now());
182
            }
181
            }
-
 
182
 
183
        }
183
        }
184
        vendorCatalogPricingLog.setStatus(status);
184
        vendorCatalogPricingLog.setStatus(status);
185
        vendorCatalogPricingLog.setUpdatedTimestamp(LocalDateTime.now());
185
        vendorCatalogPricingLog.setUpdatedTimestamp(LocalDateTime.now());
186
        if (vendorCatalogPricingLog.getStatus().equals(VendorCatalogPricingStatus.APPROVED)) {
186
        if (vendorCatalogPricingLog.getStatus().equals(VendorCatalogPricingStatus.APPROVED)) {
187
            vendorCatalogPricingLog.setApprovedBy(authUser.getId());
187
            vendorCatalogPricingLog.setApprovedBy(authUser.getId());