Subversion Repositories SmartDukaan

Rev

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

Rev 24807 Rev 24823
Line 77... Line 77...
77
import com.spice.profitmandi.dao.enumuration.fofo.ReturnType;
77
import com.spice.profitmandi.dao.enumuration.fofo.ReturnType;
78
import com.spice.profitmandi.dao.enumuration.fofo.ScanType;
78
import com.spice.profitmandi.dao.enumuration.fofo.ScanType;
79
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;
80
import com.spice.profitmandi.dao.repository.GenericRepository;
81
import com.spice.profitmandi.dao.repository.catalog.ItemRepository;
81
import com.spice.profitmandi.dao.repository.catalog.ItemRepository;
-
 
82
import com.spice.profitmandi.dao.repository.catalog.TagListingRepository;
82
import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
83
import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
83
import com.spice.profitmandi.dao.repository.dtr.InsurancePolicyRepository;
84
import com.spice.profitmandi.dao.repository.dtr.InsurancePolicyRepository;
84
import com.spice.profitmandi.dao.repository.dtr.InsuranceProviderRepository;
85
import com.spice.profitmandi.dao.repository.dtr.InsuranceProviderRepository;
85
import com.spice.profitmandi.dao.repository.dtr.PaymentOptionTransactionRepository;
86
import com.spice.profitmandi.dao.repository.dtr.PaymentOptionTransactionRepository;
86
import com.spice.profitmandi.dao.repository.dtr.PolicyNumberGenerationSequenceRepository;
87
import com.spice.profitmandi.dao.repository.dtr.PolicyNumberGenerationSequenceRepository;
Line 123... Line 124...
123
 
124
 
124
	@Autowired
125
	@Autowired
125
	@Qualifier("fofoInventoryItemRepository")
126
	@Qualifier("fofoInventoryItemRepository")
126
	private InventoryItemRepository inventoryItemRepository;
127
	private InventoryItemRepository inventoryItemRepository;
127
 
128
 
128
	
-
 
129
	@Autowired
129
	@Autowired
130
	private LiveDemoBillingRespository liveDemoBillingRespository;
130
	private LiveDemoBillingRespository liveDemoBillingRespository;
131
	
131
 
132
	@Autowired
132
	@Autowired
133
	private WalletService walletService;
133
	private WalletService walletService;
134
 
134
 
135
	@Autowired
135
	@Autowired
136
	@Qualifier("fofoCurrentInventorySnapshotRepository")
136
	@Qualifier("fofoCurrentInventorySnapshotRepository")
Line 209... Line 209...
209
 
209
 
210
	@Autowired
210
	@Autowired
211
	private PrivateDealUserRepository privateDealUserRepository;
211
	private PrivateDealUserRepository privateDealUserRepository;
212
 
212
 
213
	@Autowired
213
	@Autowired
-
 
214
	private TagListingRepository tagListingRepository;
-
 
215
 
-
 
216
	@Autowired
214
	private CounterRepository counterRepository;
217
	private CounterRepository counterRepository;
215
 
218
 
216
	@Autowired
219
	@Autowired
217
	private FofoStoreRepository fofoStoreRepository;
220
	private FofoStoreRepository fofoStoreRepository;
218
 
221
 
Line 392... Line 395...
392
							.getSerialNumberDetails().stream().map(x -> x.getSerialNumber())
395
							.getSerialNumberDetails().stream().map(x -> x.getSerialNumber())
393
							.collect(Collectors.toList());
396
							.collect(Collectors.toList());
394
					throw new ProfitMandiBusinessException("invalidSerialNumbers", invalidSerialNumbers, "FFORDR_1004");
397
					throw new ProfitMandiBusinessException("invalidSerialNumbers", invalidSerialNumbers, "FFORDR_1004");
395
				}
398
				}
396
				List<String> serialNumberList = liveDemoBillingRespository.selectAllSerialNumber();
399
				List<String> serialNumberList = liveDemoBillingRespository.selectAllSerialNumber();
397
				
400
 
398
				Set<InventoryItem> inventoryItemsSerializedserialized = serializedInventoryItemMap.get(item.getId());
401
				Set<InventoryItem> inventoryItemsSerializedserialized = serializedInventoryItemMap.get(item.getId());
399
				for (InventoryItem inventoryItem : inventoryItemsSerializedserialized) {
402
				for (InventoryItem inventoryItem : inventoryItemsSerializedserialized) {
400
					inventoryItem.setGoodQuantity(0);
403
					inventoryItem.setGoodQuantity(0);
401
					inventoryItemIdQuantityUsed.put(inventoryItem.getId(), 1);
404
					inventoryItemIdQuantityUsed.put(inventoryItem.getId(), 1);
402
					if(serialNumberList.contains(inventoryItem.getSerialNumber())){
405
					if (serialNumberList.contains(inventoryItem.getSerialNumber())) {
403
						LiveDemoSerialNumber liveDemoSerialNumber = liveDemoBillingRespository.selectBySerialNumber(inventoryItem.getSerialNumber());
406
						LiveDemoSerialNumber liveDemoSerialNumber = liveDemoBillingRespository
-
 
407
								.selectBySerialNumber(inventoryItem.getSerialNumber());
404
						liveDemoBillingRespository.delete(liveDemoSerialNumber);
408
						liveDemoBillingRespository.delete(liveDemoSerialNumber);
405
					}
409
					}
406
				}
410
				}
407
				inventoryItemsToBill.put(item.getId(), inventoryItemsSerializedserialized);
411
				inventoryItemsToBill.put(item.getId(), inventoryItemsSerializedserialized);
408
			} else {
412
			} else {
Line 499... Line 503...
499
						.get(insuranceModel.getInsuranceId());
503
						.get(insuranceModel.getInsuranceId());
500
				InsurancePolicy insurancePolicy = this.createInsurancePolicy(fofoOrder.getInvoiceNumber(), fofoId,
504
				InsurancePolicy insurancePolicy = this.createInsurancePolicy(fofoOrder.getInvoiceNumber(), fofoId,
501
						insuranceModel.getInsuranceAmount() - mobileInsurancePlan.getPartnerCommission(),
505
						insuranceModel.getInsuranceAmount() - mobileInsurancePlan.getPartnerCommission(),
502
						insuranceModel.getInsuranceAmount(), insuranceModel.getDeviceSellingPrice(), entry.getKey(),
506
						insuranceModel.getInsuranceAmount(), insuranceModel.getDeviceSellingPrice(), entry.getKey(),
503
						insuranceModel.getModelName(), insuranceModel.getBrand(), customer, customerDateOfBirth,
507
						insuranceModel.getModelName(), insuranceModel.getBrand(), customer, customerDateOfBirth,
-
 
508
						customerAddress,
504
						customerAddress, mobileInsurancePlan.getProductName() + " for " + mobileInsurancePlan.getDuration() + " Months");
509
						mobileInsurancePlan.getProductName() + " for " + mobileInsurancePlan.getDuration() + " Months");
505
 
510
 
506
				String walletDescription = null;
511
				String walletDescription = null;
507
				if (mobileInsurancePlan.getProviderId().equals("0")) {
512
				if (mobileInsurancePlan.getProviderId().equals("0")) {
508
					insurancePolicy.setProviderId(1);
513
					insurancePolicy.setProviderId(1);
509
					int policyNumberGenerationSequence = this.createPolicyNumberGenerationSequence().getSequence();
514
					int policyNumberGenerationSequence = this.createPolicyNumberGenerationSequence().getSequence();
Line 637... Line 642...
637
				.selectByReferenceIdAndType(fofoOrder.getId(), PaymentOptionReferenceType.ORDER);
642
				.selectByReferenceIdAndType(fofoOrder.getId(), PaymentOptionReferenceType.ORDER);
638
 
643
 
639
		List<CustomPaymentOption> paymentOptions = new ArrayList<>();
644
		List<CustomPaymentOption> paymentOptions = new ArrayList<>();
640
 
645
 
641
		PdfModel pdfModel = new PdfModel();
646
		PdfModel pdfModel = new PdfModel();
642
		pdfModel.setCancelled(fofoOrder.getCancelledTimestamp()!=null);
647
		pdfModel.setCancelled(fofoOrder.getCancelledTimestamp() != null);
643
		for (PaymentOptionTransaction paymentOptionTransaction : paymentOptionTransactions) {
648
		for (PaymentOptionTransaction paymentOptionTransaction : paymentOptionTransactions) {
644
			CustomPaymentOption cpi = new CustomPaymentOption();
649
			CustomPaymentOption cpi = new CustomPaymentOption();
645
			cpi.setAmount(paymentOptionTransaction.getAmount());
650
			cpi.setAmount(paymentOptionTransaction.getAmount());
646
			cpi.setPaymentOption(
651
			cpi.setPaymentOption(
647
					paymentOptionRepository.selectById(paymentOptionTransaction.getPaymentOptionId()).getName());
652
					paymentOptionRepository.selectById(paymentOptionTransaction.getPaymentOptionId()).getName());
Line 1124... Line 1129...
1124
		FofoOrderItem fofoOrderItem = new FofoOrderItem();
1129
		FofoOrderItem fofoOrderItem = new FofoOrderItem();
1125
		fofoOrderItem.setItemId(customFofoOrderItem.getItemId());
1130
		fofoOrderItem.setItemId(customFofoOrderItem.getItemId());
1126
		fofoOrderItem.setQuantity(customFofoOrderItem.getQuantity());
1131
		fofoOrderItem.setQuantity(customFofoOrderItem.getQuantity());
1127
		fofoOrderItem.setSellingPrice(customFofoOrderItem.getSellingPrice());
1132
		fofoOrderItem.setSellingPrice(customFofoOrderItem.getSellingPrice());
1128
		fofoOrderItem.setOrderId(fofoOrderId);
1133
		fofoOrderItem.setOrderId(fofoOrderId);
1129
		fofoOrderItem.setDp(customFofoOrderItem.getSellingPrice());
1134
		fofoOrderItem.setDp(tagListingRepository.selectById(customFofoOrderItem.getItemId()).getSellingPrice());
1130
		fofoOrderItem.setDiscount(customFofoOrderItem.getDiscountAmount());
1135
		fofoOrderItem.setDiscount(customFofoOrderItem.getDiscountAmount());
-
 
1136
 
1131
		Item item = itemMap.get(customFofoOrderItem.getItemId());
1137
		Item item = itemMap.get(customFofoOrderItem.getItemId());
1132
		Map<Integer, GstRate> itemIdStateTaxRateMap = null;
1138
		Map<Integer, GstRate> itemIdStateTaxRateMap = null;
1133
		Map<Integer, Float> itemIdIgstTaxRateMap = null;
1139
		Map<Integer, Float> itemIdIgstTaxRateMap = null;
1134
		if (stateId != null) {
1140
		if (stateId != null) {
1135
			itemIdStateTaxRateMap = Utils.getStateTaxRate(new ArrayList<>(itemMap.keySet()), stateId);
1141
			itemIdStateTaxRateMap = Utils.getStateTaxRate(new ArrayList<>(itemMap.keySet()), stateId);