Subversion Repositories SmartDukaan

Rev

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

Rev 28339 Rev 28345
Line 118... Line 118...
118
	@Autowired
118
	@Autowired
119
	CustomerAddressRepository customerAddressRepository;
119
	CustomerAddressRepository customerAddressRepository;
120
 
120
 
121
	@Value("${new.solr.url}")
121
	@Value("${new.solr.url}")
122
	private String solrUrl;
122
	private String solrUrl;
123
	
123
 
124
	@Autowired
124
	@Autowired
125
	private PartnerIndexService partnerIndexService;
125
	private PartnerIndexService partnerIndexService;
126
	
126
 
127
	@Autowired
127
	@Autowired
128
	InventoryService inventoryService;
128
	InventoryService inventoryService;
129
 
129
 
130
	@Autowired
130
	@Autowired
131
	UserAccountRepository userAccountRepository;
131
	UserAccountRepository userAccountRepository;
Line 791... Line 791...
791
		cust.setGender(customer.getGender());
791
		cust.setGender(customer.getGender());
792
		cust.setProfileImageId(customer.getProfileImageId());
792
		cust.setProfileImageId(customer.getProfileImageId());
793
		cust.setDob(customer.getDob());
793
		cust.setDob(customer.getDob());
794
		return responseSender.ok(cust);
794
		return responseSender.ok(cust);
795
	}
795
	}
796
	
796
 
797
	@RequestMapping(value = "/stores/{state}/{city}/{storeCode}", method = RequestMethod.GET)
797
	@RequestMapping(value = "/stores/{state}/{city}/{storeCode}", method = RequestMethod.GET)
798
	public void getStoreIndex(HttpServletResponse response, HttpServletRequest request, @PathVariable String state, @PathVariable String city, @PathVariable String storeCode)
798
	public void getStoreIndex(HttpServletResponse response, HttpServletRequest request, @PathVariable String state,
799
			throws Throwable {
799
			@PathVariable String city, @PathVariable String storeCode) throws Throwable {
800
		logger.info("Store code {}", storeCode);
800
		logger.info("Store code {}", storeCode);
801
		storeCode = storeCode.toUpperCase();
801
		storeCode = storeCode.toUpperCase();
802
		Map<String,Integer> map = retailerService.getStoreCodeRetailerMap();
802
		Map<String, Integer> map = retailerService.getStoreCodeRetailerMap();
803
		logger.info("retailer id {}",  map.get(storeCode));
803
		logger.info("retailer id {}", map.get(storeCode));
804
		String retailerName = retailerService.getAllFofoRetailers().get(map.get(storeCode)).getBusinessName();
804
		String retailerName = retailerService.getAllFofoRetailers().get(map.get(storeCode)).getBusinessName();
805
		String html = partnerIndexService.getPartnerIndexHtml();
805
		String html = partnerIndexService.getPartnerIndexHtml();
806
		logger.info("html {}", html);
806
		logger.info("html {}", html);
807
		html = html.replace("Buy Mobiles and Accessories at exciting prices - SmartDukaan",
807
		html = html.replace("Buy Mobiles and Accessories at exciting prices - SmartDukaan",
808
				String.format("%s is now ONLINE. Buy Mobiles, Accessories & more | SmartDukaan", retailerName));
808
				String.format("%s is now ONLINE. Buy Mobiles, Accessories & more | SmartDukaan", retailerName));
Line 822... Line 822...
822
			pendingOrderItem.setStatusDescription(statusDescription);
822
			pendingOrderItem.setStatusDescription(statusDescription);
823
			pendingOrderItem.setCancelledTimestamp(LocalDateTime.now());
823
			pendingOrderItem.setCancelledTimestamp(LocalDateTime.now());
824
			List<OrderStatus> status = pendingOrderItemRepository.selectByOrderId(pendingOrderItem.getOrderId())
824
			List<OrderStatus> status = pendingOrderItemRepository.selectByOrderId(pendingOrderItem.getOrderId())
825
					.stream().map(x -> x.getStatus()).collect(Collectors.toList());
825
					.stream().map(x -> x.getStatus()).collect(Collectors.toList());
826
 
826
 
827
			if (!status.contains(OrderStatus.PENDING) && !status.contains(OrderStatus.BILLED)
827
			if (!status.contains(OrderStatus.PENDING) && !status.contains(OrderStatus.PROCESSING)
828
					&& !status.contains(OrderStatus.UNSETTLED) && !status.contains(OrderStatus.CLAIMED)) {
828
					&& !status.contains(OrderStatus.BILLED) && !status.contains(OrderStatus.UNSETTLED)
-
 
829
					&& !status.contains(OrderStatus.CLAIMED)) {
829
				pendingOrder.setStatus(OrderStatus.CLOSED);
830
				pendingOrder.setStatus(OrderStatus.CLOSED);
830
			}
831
			}
831
 
832
 
832
			pendingOrderItemRepository.persist(pendingOrderItem);
833
			pendingOrderItemRepository.persist(pendingOrderItem);
833
			String itemDescription = itemRepository.selectById(pendingOrderItem.getItemId()).getItemDescription();
834
			String itemDescription = itemRepository.selectById(pendingOrderItem.getItemId()).getItemDescription();