Subversion Repositories SmartDukaan

Rev

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

Rev 24466 Rev 24470
Line 65... Line 65...
65 
import com.spice.profitmandi.dao.entity.fofo.FofoOrder;
 65 
import com.spice.profitmandi.dao.entity.fofo.FofoOrder;
66 
import com.spice.profitmandi.dao.entity.fofo.FofoOrderItem;
 66 
import com.spice.profitmandi.dao.entity.fofo.FofoOrderItem;
67 
import com.spice.profitmandi.dao.entity.fofo.FofoStore;
 67 
import com.spice.profitmandi.dao.entity.fofo.FofoStore;
68 
import com.spice.profitmandi.dao.entity.fofo.InventoryItem;
 68 
import com.spice.profitmandi.dao.entity.fofo.InventoryItem;
69 
import com.spice.profitmandi.dao.entity.fofo.InvoiceNumberGenerationSequence;
 69 
import com.spice.profitmandi.dao.entity.fofo.InvoiceNumberGenerationSequence;
- 
 
 70 
import com.spice.profitmandi.dao.entity.fofo.LiveDemoSerialNumber;
70 
import com.spice.profitmandi.dao.entity.fofo.ScanRecord;
 71 
import com.spice.profitmandi.dao.entity.fofo.ScanRecord;
71 
import com.spice.profitmandi.dao.entity.user.Address;
 72 
import com.spice.profitmandi.dao.entity.user.Address;
72 
import com.spice.profitmandi.dao.entity.user.Counter;
 73 
import com.spice.profitmandi.dao.entity.user.Counter;
73 
import com.spice.profitmandi.dao.entity.user.PrivateDealUser;
 74 
import com.spice.profitmandi.dao.entity.user.PrivateDealUser;
74 
import com.spice.profitmandi.dao.enumuration.catalog.SchemeType;
 75 
import com.spice.profitmandi.dao.enumuration.catalog.SchemeType;
75 
import com.spice.profitmandi.dao.enumuration.dtr.PaymentOptionReferenceType;
 76 
import com.spice.profitmandi.dao.enumuration.dtr.PaymentOptionReferenceType;
76 
import com.spice.profitmandi.dao.enumuration.fofo.ReturnType;
 77 
import com.spice.profitmandi.dao.enumuration.fofo.ReturnType;
77 
import com.spice.profitmandi.dao.enumuration.fofo.ScanType;
 78 
import com.spice.profitmandi.dao.enumuration.fofo.ScanType;
78 
import com.spice.profitmandi.dao.enumuration.fofo.SettlementType;
 79 
import com.spice.profitmandi.dao.enumuration.fofo.SettlementType;
- 
 
 80 
import com.spice.profitmandi.dao.repository.GenericRepository;
79 
import com.spice.profitmandi.dao.repository.catalog.ItemRepository;
 81 
import com.spice.profitmandi.dao.repository.catalog.ItemRepository;
80 
import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
 82 
import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
81 
import com.spice.profitmandi.dao.repository.dtr.InsurancePolicyRepository;
 83 
import com.spice.profitmandi.dao.repository.dtr.InsurancePolicyRepository;
82 
import com.spice.profitmandi.dao.repository.dtr.InsuranceProviderRepository;
 84 
import com.spice.profitmandi.dao.repository.dtr.InsuranceProviderRepository;
83 
import com.spice.profitmandi.dao.repository.dtr.PaymentOptionTransactionRepository;
 85 
import com.spice.profitmandi.dao.repository.dtr.PaymentOptionTransactionRepository;
Line 94... Line 96...
94 
import com.spice.profitmandi.dao.repository.fofo.FofoLineItemRepository;
 96 
import com.spice.profitmandi.dao.repository.fofo.FofoLineItemRepository;
95 
import com.spice.profitmandi.dao.repository.fofo.FofoOrderItemRepository;
 97 
import com.spice.profitmandi.dao.repository.fofo.FofoOrderItemRepository;
96 
import com.spice.profitmandi.dao.repository.fofo.FofoOrderRepository;
 98 
import com.spice.profitmandi.dao.repository.fofo.FofoOrderRepository;
97 
import com.spice.profitmandi.dao.repository.fofo.InventoryItemRepository;
 99 
import com.spice.profitmandi.dao.repository.fofo.InventoryItemRepository;
98 
import com.spice.profitmandi.dao.repository.fofo.InvoiceNumberGenerationSequenceRepository;
 100 
import com.spice.profitmandi.dao.repository.fofo.InvoiceNumberGenerationSequenceRepository;
- 
 
 101 
import com.spice.profitmandi.dao.repository.fofo.LiveDemoBillingRespository;
99 
import com.spice.profitmandi.dao.repository.fofo.PaymentOptionRepository;
 102 
import com.spice.profitmandi.dao.repository.fofo.PaymentOptionRepository;
100 
import com.spice.profitmandi.dao.repository.fofo.PurchaseReturnItemRepository;
 103 
import com.spice.profitmandi.dao.repository.fofo.PurchaseReturnItemRepository;
101 
import com.spice.profitmandi.dao.repository.fofo.ScanRecordRepository;
 104 
import com.spice.profitmandi.dao.repository.fofo.ScanRecordRepository;
102 
import com.spice.profitmandi.dao.repository.user.AddressRepository;
 105 
import com.spice.profitmandi.dao.repository.user.AddressRepository;
103 
import com.spice.profitmandi.dao.repository.user.CounterRepository;
 106 
import com.spice.profitmandi.dao.repository.user.CounterRepository;
Line 120... Line 123...
120 
 
 123 
 
121 
	@Autowired
 124 
	@Autowired
122 
	@Qualifier("fofoInventoryItemRepository")
 125 
	@Qualifier("fofoInventoryItemRepository")
123 
	private InventoryItemRepository inventoryItemRepository;
 126 
	private InventoryItemRepository inventoryItemRepository;
124 
 
 127 
 
- 
 
 128
- 
 
 129 
	@Autowired
- 
 
 130 
	private LiveDemoBillingRespository liveDemoBillingRespository;
- 
 
 131
125 
	@Autowired
 132 
	@Autowired
126 
	private WalletService walletService;
 133 
	private WalletService walletService;
127 
 
 134 
 
128 
	@Autowired
 135 
	@Autowired
129 
	@Qualifier("fofoCurrentInventorySnapshotRepository")
 136 
	@Qualifier("fofoCurrentInventorySnapshotRepository")
Line 384... Line 391...
384 
					List<String> invalidSerialNumbers = itemIdCustomFofoOrderItemMap.get(item.getId())
 391 
					List<String> invalidSerialNumbers = itemIdCustomFofoOrderItemMap.get(item.getId())
385 
							.getSerialNumberDetails().stream().map(x -> x.getSerialNumber())
 392 
							.getSerialNumberDetails().stream().map(x -> x.getSerialNumber())
386 
							.collect(Collectors.toList());
 393 
							.collect(Collectors.toList());
387 
					throw new ProfitMandiBusinessException("invalidSerialNumbers", invalidSerialNumbers, "FFORDR_1004");
 394 
					throw new ProfitMandiBusinessException("invalidSerialNumbers", invalidSerialNumbers, "FFORDR_1004");
388 
				}
 395 
				}
- 
 
 396 
				List<String> serialNumberList = liveDemoBillingRespository.selectAllSerialNumber();
- 
 
 397
389 
				Set<InventoryItem> inventoryItemsSerializedserialized = serializedInventoryItemMap.get(item.getId());
 398 
				Set<InventoryItem> inventoryItemsSerializedserialized = serializedInventoryItemMap.get(item.getId());
390 
				for (InventoryItem inventoryItem : inventoryItemsSerializedserialized) {
 399 
				for (InventoryItem inventoryItem : inventoryItemsSerializedserialized) {
391 
					inventoryItem.setGoodQuantity(0);
 400 
					inventoryItem.setGoodQuantity(0);
392 
					inventoryItemIdQuantityUsed.put(inventoryItem.getId(), 1);
 401 
					inventoryItemIdQuantityUsed.put(inventoryItem.getId(), 1);
- 
 
 402 
					if(serialNumberList.contains(inventoryItem.getSerialNumber())){
- 
 
 403 
						LiveDemoSerialNumber liveDemoSerialNumber = liveDemoBillingRespository.selectBySerialNumber(inventoryItem.getSerialNumber());
- 
 
 404 
						liveDemoBillingRespository.delete(liveDemoSerialNumber);
- 
 
 405 
					}
393 
				}
 406 
				}
394 
				inventoryItemsToBill.put(item.getId(), inventoryItemsSerializedserialized);
 407 
				inventoryItemsToBill.put(item.getId(), inventoryItemsSerializedserialized);
395 
			} else {
 408 
			} else {
396 
				Set<InventoryItem> inventoryItemsNonSerialized = nonSerializedInventoryItemMap.get(item.getId());
 409 
				Set<InventoryItem> inventoryItemsNonSerialized = nonSerializedInventoryItemMap.get(item.getId());
397 
				int quantityToBill = itemIdCustomFofoOrderItemMap.get(item.getId()).getQuantity();
 410 
				int quantityToBill = itemIdCustomFofoOrderItemMap.get(item.getId()).getQuantity();