Subversion Repositories SmartDukaan

Rev

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

Rev 24241 Rev 24242
Line 11... Line 11...
11 
import java.util.Arrays;
 11 
import java.util.Arrays;
12 
import java.util.HashMap;
 12 
import java.util.HashMap;
13 
import java.util.HashSet;
 13 
import java.util.HashSet;
14 
import java.util.List;
 14 
import java.util.List;
15 
import java.util.Map;
 15 
import java.util.Map;
- 
 
 16 
import java.util.Optional;
16 
import java.util.stream.Collectors;
 17 
import java.util.stream.Collectors;
17 
 
 18 
 
18 
import javax.mail.MessagingException;
 19 
import javax.mail.MessagingException;
19 
import javax.mail.internet.InternetAddress;
 20 
import javax.mail.internet.InternetAddress;
20 
import javax.mail.internet.MimeMessage;
 21 
import javax.mail.internet.MimeMessage;
Line 49... Line 50...
49 
import com.spice.profitmandi.dao.entity.fofo.FofoOrder;
 50 
import com.spice.profitmandi.dao.entity.fofo.FofoOrder;
50 
import com.spice.profitmandi.dao.entity.fofo.FofoStore;
 51 
import com.spice.profitmandi.dao.entity.fofo.FofoStore;
51 
import com.spice.profitmandi.dao.entity.fofo.PartnerTargetDetails;
 52 
import com.spice.profitmandi.dao.entity.fofo.PartnerTargetDetails;
52 
import com.spice.profitmandi.dao.entity.fofo.Purchase;
 53 
import com.spice.profitmandi.dao.entity.fofo.Purchase;
53 
import com.spice.profitmandi.dao.entity.fofo.SaleHeadDetails;
 54 
import com.spice.profitmandi.dao.entity.fofo.SaleHeadDetails;
- 
 
 55 
import com.spice.profitmandi.dao.entity.fofo.ScanRecord;
54 
import com.spice.profitmandi.dao.entity.fofo.SchemeInOut;
 56 
import com.spice.profitmandi.dao.entity.fofo.SchemeInOut;
55 
import com.spice.profitmandi.dao.entity.transaction.Order;
 57 
import com.spice.profitmandi.dao.entity.transaction.Order;
56 
import com.spice.profitmandi.dao.enumuration.catalog.AmountType;
 58 
import com.spice.profitmandi.dao.enumuration.catalog.AmountType;
- 
 
 59 
import com.spice.profitmandi.dao.enumuration.fofo.ScanType;
57 
import com.spice.profitmandi.dao.repository.catalog.SchemeRepository;
 60 
import com.spice.profitmandi.dao.repository.catalog.SchemeRepository;
58 
import com.spice.profitmandi.dao.repository.dtr.DailyRechargeRepository;
 61 
import com.spice.profitmandi.dao.repository.dtr.DailyRechargeRepository;
59 
import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
 62 
import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
60 
import com.spice.profitmandi.dao.repository.dtr.RechargeProviderCreditWalletHistoryRepository;
 63 
import com.spice.profitmandi.dao.repository.dtr.RechargeProviderCreditWalletHistoryRepository;
61 
import com.spice.profitmandi.dao.repository.dtr.RechargeProviderRepository;
 64 
import com.spice.profitmandi.dao.repository.dtr.RechargeProviderRepository;
62 
import com.spice.profitmandi.dao.repository.dtr.RechargeTransactionRepository;
 65 
import com.spice.profitmandi.dao.repository.dtr.RechargeTransactionRepository;
63 
import com.spice.profitmandi.dao.repository.fofo.FofoOrderRepository;
 66 
import com.spice.profitmandi.dao.repository.fofo.FofoOrderRepository;
64 
import com.spice.profitmandi.dao.repository.fofo.PartnerTargetRepository;
 67 
import com.spice.profitmandi.dao.repository.fofo.PartnerTargetRepository;
65 
import com.spice.profitmandi.dao.repository.fofo.PurchaseRepository;
 68 
import com.spice.profitmandi.dao.repository.fofo.PurchaseRepository;
- 
 
 69 
import com.spice.profitmandi.dao.repository.fofo.ScanRecordRepository;
66 
import com.spice.profitmandi.dao.repository.fofo.SchemeInOutRepository;
 70 
import com.spice.profitmandi.dao.repository.fofo.SchemeInOutRepository;
67 
import com.spice.profitmandi.dao.repository.transaction.OrderRepository;
 71 
import com.spice.profitmandi.dao.repository.transaction.OrderRepository;
68 
import com.spice.profitmandi.service.inventory.InventoryService;
 72 
import com.spice.profitmandi.service.inventory.InventoryService;
69 
import com.spice.profitmandi.service.recharge.provider.OxigenRechargeProviderService;
 73 
import com.spice.profitmandi.service.recharge.provider.OxigenRechargeProviderService;
70 
import com.spice.profitmandi.service.recharge.provider.ThinkWalnutDigitalRechargeProviderService;
 74 
import com.spice.profitmandi.service.recharge.provider.ThinkWalnutDigitalRechargeProviderService;
Line 145... Line 149...
145 
 
 149 
 
146 
	@Autowired
 150 
	@Autowired
147 
	private RechargeProviderRepository rechargeProviderRepository;
 151 
	private RechargeProviderRepository rechargeProviderRepository;
148 
 
 152 
 
149 
	@Autowired
 153 
	@Autowired
- 
 
 154 
	private ScanRecordRepository scanRecordRepository;
- 
 
 155 
 
- 
 
 156 
	@Autowired
150 
	private DailyRechargeRepository dailyRechargeRepository;
 157 
	private DailyRechargeRepository dailyRechargeRepository;
151 
 
 158 
 
152 
	@Autowired
 159 
	@Autowired
153 
	private FofoStoreRepository fofoStoreRepository;
 160 
	private FofoStoreRepository fofoStoreRepository;
154 
 
 161 
 
Line 330... Line 337...
330 
					LocalDateTime endDateTime = x.getEndDateTime();
 337 
					LocalDateTime endDateTime = x.getEndDateTime();
331 
					if (x.getExpireTimestamp() != null && x.getExpireTimestamp().isBefore(x.getEndDateTime())) {
 338 
					if (x.getExpireTimestamp() != null && x.getExpireTimestamp().isBefore(x.getEndDateTime())) {
332 
						endDateTime = x.getExpireTimestamp();
 339 
						endDateTime = x.getExpireTimestamp();
333 
					}
 340 
					}
334 
					for (SchemeInOut sio : sioList) {
 341 
					for (SchemeInOut sio : sioList) {
- 
 
 342 
						Optional<ScanRecord> record = scanRecordRepository.selectByInventoryItemId(sio.getInventoryItemId()).stream().filter(y->y.getType().equals(ScanType.SALE)).findFirst();
- 
 
 343 
						if(record.isPresent()) {
- 
 
 344 
							if (record.get().getCreateTimestamp().isAfter(endDateTime)
335 
						if(sio.getCreateTimestamp().isAfter(endDateTime) || sio.getCreateTimestamp().isBefore(x.getStartDateTime())) {
 345 
									|| record.get().getCreateTimestamp().isBefore(x.getStartDateTime())) {
336 
							LOGGER.info("Scheme disbursed for inventoryItem {} and scheme {}", sio.getInventoryItemId(), sio.getSchemeId());
 346 
								LOGGER.info("Scheme disbursed for inventoryItem {} and scheme {}", sio.getInventoryItemId(),
- 
 
 347 
										sio.getSchemeId());
- 
 
 348 
							}
337 
						}
 349 
						}
338 
					}
 350 
					}
339 
				}
 351 
				}
340 
			}
 352 
			}
341 
		});
 353 
		});