Subversion Repositories SmartDukaan

Rev

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

Rev 24271 Rev 24276
Line 358... Line 358...
358
		List<FofoOrderItem> fofoOrderItems = fofoOrderItemRepository.selectByOrderId(fofoOrder.getId());
358
		List<FofoOrderItem> fofoOrderItems = fofoOrderItemRepository.selectByOrderId(fofoOrder.getId());
359
		Customer customer = customerRepository.selectById(fofoOrder.getCustomerId());
359
		Customer customer = customerRepository.selectById(fofoOrder.getCustomerId());
360
		CustomerAddress customerAddress = customerAddressRepository.selectById(fofoOrder.getCustomerAddressId());
360
		CustomerAddress customerAddress = customerAddressRepository.selectById(fofoOrder.getCustomerAddressId());
361
		List<Integer> fofoPartnerPaymentOptions = fofoPartnerPaymentOptionRepository
361
		List<Integer> fofoPartnerPaymentOptions = fofoPartnerPaymentOptionRepository
362
				.selectPaymentOptionIdsByFofoId(fofoOrder.getFofoId());
362
				.selectPaymentOptionIdsByFofoId(fofoOrder.getFofoId());
-
 
363
		
-
 
364
		Map<Integer, Item> itemsMap = fofoOrderItems.stream().collect(Collectors.toMap(x -> x.getItemId(), x -> {
-
 
365
			try {
-
 
366
				return itemRepository.selectById(x.getItemId());
-
 
367
			} catch (ProfitMandiBusinessException e) {
-
 
368
				// TODO Auto-generated catch block
-
 
369
				return null;
-
 
370
			}
-
 
371
		}));
363
		LOGGER.info("fofoPartnerPaymentOptions" + fofoPartnerPaymentOptions);
372
		LOGGER.info("fofoPartnerPaymentOptions" + fofoPartnerPaymentOptions);
364
		List<PaymentOptionTransaction> paymentOptionTransactions = fofoOrderPaymentOptionRepository
373
		List<PaymentOptionTransaction> paymentOptionTransactions = fofoOrderPaymentOptionRepository
365
				.selectByReferenceIdAndType(fofoOrder.getId(), PaymentOptionReferenceType.ORDER);
374
				.selectByReferenceIdAndType(fofoOrder.getId(), PaymentOptionReferenceType.ORDER);
366
		LOGGER.info("paymentOptionTransactions" + paymentOptionTransactions);
375
		LOGGER.info("paymentOptionTransactions" + paymentOptionTransactions);
367
		Map<Integer, PaymentOption> paymentOptionIdPaymentOptionMap = this
376
		Map<Integer, PaymentOption> paymentOptionIdPaymentOptionMap = this
Line 375... Line 384...
375
		model.addAttribute("fofoOrder", fofoOrder);
384
		model.addAttribute("fofoOrder", fofoOrder);
376
		for(FofoOrderItem fofoOrderItem : fofoOrderItems) {
385
		for(FofoOrderItem fofoOrderItem : fofoOrderItems) {
377
			fofoOrderItem.setDoa(true);
386
			fofoOrderItem.setDoa(true);
378
		}
387
		}
379
		model.addAttribute("fofoOrderItems", fofoOrderItems);
388
		model.addAttribute("fofoOrderItems", fofoOrderItems);
-
 
389
		model.addAttribute("itemsMap", itemsMap);
380
		model.addAttribute("markDefective", true);
390
		model.addAttribute("markDefective", true);
381
		model.addAttribute("customer", customer);
391
		model.addAttribute("customer", customer);
382
		model.addAttribute("customerAddress", customerAddress);
392
		model.addAttribute("customerAddress", customerAddress);
383
		model.addAttribute("paymentOptionTransactions", paymentOptionTransactions);
393
		model.addAttribute("paymentOptionTransactions", paymentOptionTransactions);
384
		model.addAttribute("paymentOptionIdPaymentOptionMap", paymentOptionIdPaymentOptionMap);
394
		model.addAttribute("paymentOptionIdPaymentOptionMap", paymentOptionIdPaymentOptionMap);