WebSVN – SmartDukaan – Diff – /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java

 import com.spice.profitmandi.common.enumuration.SchemeType;
 import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
 import com.spice.profitmandi.common.model.CreatePendingOrderItem;
 import com.spice.profitmandi.common.model.CreatePendingOrderRequest;
 import com.spice.profitmandi.common.model.CustomRetailer;
-import com.spice.profitmandi.common.model.CustomerOrderDetail;
 import com.spice.profitmandi.common.model.ProfitMandiConstants;
 import com.spice.profitmandi.common.model.UserInfo;
 import com.spice.profitmandi.common.solr.SolrService;
 import com.spice.profitmandi.common.web.client.RestClient;
 import com.spice.profitmandi.common.web.util.ResponseSender;
 import com.spice.profitmandi.dao.entity.fofo.CustomerAddress;
 import com.spice.profitmandi.dao.entity.fofo.PendingOrder;
 import com.spice.profitmandi.dao.entity.fofo.PendingOrderItem;
 import com.spice.profitmandi.dao.entity.fofo.PincodePartner;
 import com.spice.profitmandi.dao.enumuration.dtr.OtpType;
+import com.spice.profitmandi.dao.enumuration.transaction.OrderStatus;
 import com.spice.profitmandi.dao.model.AddCartRequest;
 import com.spice.profitmandi.dao.model.CartItem;
 import com.spice.profitmandi.dao.model.CartItemResponseModel;
 import com.spice.profitmandi.dao.model.CartResponse;
+import com.spice.profitmandi.dao.model.CustomerOrderDetail;
 import com.spice.profitmandi.dao.model.UserCart;
 import com.spice.profitmandi.dao.repository.catalog.ItemRepository;
 import com.spice.profitmandi.dao.repository.catalog.TagListingRepository;
 import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
 import com.spice.profitmandi.dao.repository.dtr.UserAccountRepository;
 	@Autowired
 	CustomerAddressRepository customerAddressRepository;
 	@Autowired
 	SolrService solrService;
 	@Autowired
 	InventoryService inventoryService;
 	@Autowired
 	UserAccountRepository userAccountRepository;
 	@Value("${python.api.host}")
 	private String host;
 	@Autowired
 	JavaMailSender mailSender;
 	List<String> filterableParams = Arrays.asList("brand");
+	/*
-	/*@ApiImplicitParams({
+	 * @ApiImplicitParams({
+	 *
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
+	 * @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true,
+	 * dataType = "string", paramType = "header") })
+	 *
-	@RequestMapping(value = "/store/fofo", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+	 * @RequestMapping(value = "/store/fofo", method = RequestMethod.GET, produces =
+	 * MediaType.APPLICATION_JSON_VALUE) public ResponseEntity<?>
-	public ResponseEntity<?> getFofo(HttpServletRequest request,
+	 * getFofo(HttpServletRequest request,
+	 *
-			@RequestParam(value = "categoryId", required = false, defaultValue = "(3 OR 6)") String categoryId,
+	 * @RequestParam(value = "categoryId", required = false, defaultValue =
+	 * "(3 OR 6)") String categoryId,
+	 *
-			@RequestParam(value = "offset") String offset, @RequestParam(value = "limit") String limit,
+	 * @RequestParam(value = "offset") String offset, @RequestParam(value = "limit")
+	 * String limit,
+	 *
-			@RequestParam(value = "sort", required = false) String sort,
+	 * @RequestParam(value = "sort", required = false) String sort,
+	 *
-			@RequestParam(value = "brand", required = false) String brand,
+	 * @RequestParam(value = "brand", required = false) String brand,
+	 *
-			@RequestParam(value = "subCategoryId", required = false) int subCategoryId,
+	 * @RequestParam(value = "subCategoryId", required = false) int subCategoryId,
+	 *
-			@RequestParam(value = "q", required = false) String queryTerm,
+	 * @RequestParam(value = "q", required = false) String queryTerm,
+	 *
-			@RequestParam(value = "hotDeal", required = false) boolean hotDeal) throws Throwable {
+	 * @RequestParam(value = "hotDeal", required = false) boolean hotDeal) throws
-		List<FofoCatalogResponse> dealResponse = new ArrayList<>();
+	 * Throwable { List<FofoCatalogResponse> dealResponse = new ArrayList<>();
-		UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
+	 * UserInfo userInfo = (UserInfo) request.getAttribute("userInfo"); if
-		if (roleManagerService.isPartner(userInfo.getRoleIds())) {
+	 * (roleManagerService.isPartner(userInfo.getRoleIds())) { // UserCart uc =
-			// UserCart uc = userAccountRepository.getUserCart(userInfo.getUserId());
+	 * userAccountRepository.getUserCart(userInfo.getUserId()); RestClient rc = new
-			RestClient rc = new RestClient();
-			Map<String, String> params = new HashMap<>();
+	 * RestClient(); Map<String, String> params = new HashMap<>(); List<String>
-			List<String> mandatoryQ = new ArrayList<>();
+	 * mandatoryQ = new ArrayList<>(); if (queryTerm != null &&
-			if (queryTerm != null && !queryTerm.equals("null")) {
-				mandatoryQ.add(String.format("+(%s)", queryTerm));
+	 * !queryTerm.equals("null")) { mandatoryQ.add(String.format("+(%s)",
-			} else {
-				queryTerm = null;
-			}
-			if (subCategoryId != 0) {
+	 * queryTerm)); } else { queryTerm = null; } if (subCategoryId != 0) {
-				mandatoryQ
+	 * mandatoryQ .add(String.
-						.add(String.format("+(subCategoryId_i:%s) +{!parent which=\"subCategoryId_i:%s\"} tagId_i:(%s)",
+	 * format("+(subCategoryId_i:%s) +{!parent which=\"subCategoryId_i:%s\"} tagId_i:(%s)"
-								subCategoryId, subCategoryId, StringUtils.join(TAG_IDS, " ")));
+	 * , subCategoryId, subCategoryId, StringUtils.join(TAG_IDS, " "))); } else if
-			} else if (hotDeal) {
+	 * (hotDeal) { mandatoryQ.add(String.
-				mandatoryQ.add(String.format("+{!parent which=\"hot_deals_b=true\"} tagId_i:(%s)",
+	 * format("+{!parent which=\"hot_deals_b=true\"} tagId_i:(%s)",
-						StringUtils.join(TAG_IDS, " ")));
+	 * StringUtils.join(TAG_IDS, " ")));
+	 *
-			} else if (StringUtils.isNotBlank(brand)) {
+	 * } else if (StringUtils.isNotBlank(brand)) { mandatoryQ.add( String.
-				mandatoryQ.add(
-						String.format("+(categoryId_i:%s) +(brand_ss:%s) +{!parent which=\"brand_ss:%s\"} tagId_i:(%s)",
+	 * format("+(categoryId_i:%s) +(brand_ss:%s) +{!parent which=\"brand_ss:%s\"} tagId_i:(%s)"
-								categoryId, brand, brand, StringUtils.join(TAG_IDS, " ")));
+	 * , categoryId, brand, brand, StringUtils.join(TAG_IDS, " ")));
-			} else {
+	 *
-				mandatoryQ.add(
+	 * } else { mandatoryQ.add(
-						String.format("+{!parent which=\"id:catalog*\"} tagId_i:(%s)", StringUtils.join(TAG_IDS, " ")));
+	 * String.format("+{!parent which=\"id:catalog*\"} tagId_i:(%s)",
-			}
-			params.put("q", StringUtils.join(mandatoryQ, " "));
+	 * StringUtils.join(TAG_IDS, " "))); } params.put("q",
-			params.put("fl", "*, [child parentFilter=id:catalog*]");
+	 * StringUtils.join(mandatoryQ, " ")); params.put("fl",
-			if (queryTerm == null) {
+	 * "*, [child parentFilter=id:catalog*]"); if (queryTerm == null) {
-				params.put("sort", "create_s desc");
+	 * params.put("sort", "create_s desc"); } params.put("start",
-			}
-			params.put("start", String.valueOf(offset));
-			params.put("rows", String.valueOf(limit));
+	 * String.valueOf(offset)); params.put("rows", String.valueOf(limit));
-			params.put("wt", "json");
+	 * params.put("wt", "json"); String response = null; try { response =
-			String response = null;
-			try {
-				response = rc.get(SchemeType.HTTP, "50.116.10.120", 8984, "solr/demo/select", params);
+	 * rc.get(SchemeType.HTTP, "50.116.10.120", 8984, "solr/demo/select", params); }
-			} catch (HttpHostConnectException e) {
+	 * catch (HttpHostConnectException e) { throw new
-				throw new ProfitMandiBusinessException("", "", "Could not connect to host");
+	 * ProfitMandiBusinessException("", "", "Could not connect to host"); }
-			}
+	 * JSONObject solrResponseJSONObj = new
-			JSONObject solrResponseJSONObj = new JSONObject(response).getJSONObject("response");
+	 * JSONObject(response).getJSONObject("response"); JSONArray docs =
-			JSONArray docs = solrResponseJSONObj.getJSONArray("docs");
+	 * solrResponseJSONObj.getJSONArray("docs"); dealResponse =
-			dealResponse = getCatalogResponse(docs, false, userInfo.getRetailerId());
+	 * getCatalogResponse(docs, false, userInfo.getRetailerId());
+	 *
-			 * if (Mongo.PARTNER_BLoCKED_BRANDS.containsKey(userInfo.getEmail())) {
+	 * if (Mongo.PARTNER_BLoCKED_BRANDS.containsKey(userInfo.getEmail())) {
-			 * dealResponse.stream() .filter(x ->
+	 * dealResponse.stream() .filter(x ->
-			 * Mongo.PARTNER_BLoCKED_BRANDS.get(userInfo.getEmail()).contains(x.getBrand()))
+	 * Mongo.PARTNER_BLoCKED_BRANDS.get(userInfo.getEmail()).contains(x.getBrand()))
-			 * ; }
+	 * ; }
+	 *
-		} else {
-			return responseSender.badRequest(
+	 * } else { return responseSender.badRequest( new
-					new ProfitMandiBusinessException("Retailer id", userInfo.getUserId(), "NOT_FOFO_RETAILER"));
+	 * ProfitMandiBusinessException("Retailer id", userInfo.getUserId(),
-		}
-		return responseSender.ok(dealResponse);
+	 * "NOT_FOFO_RETAILER")); } return responseSender.ok(dealResponse); }
-	}*/
+	 */
 	@RequestMapping(value = "/store/entity/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	@ApiImplicitParams({
 			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
 	@ApiOperation(value = "Get unit deal object")
 		if (cr.getCartMessageChanged() > 0 || cr.getTotalAmount() != createPendingOrderRequest.getTotalAmount()) {
 			return responseSender.badRequest("Invalid request");
+		}
 		Map<String, String> returnMap = this.pendingOrderService.createPendingOrder(createPendingOrderRequest, cr);
-		Customer customer = customerRepository.selectById(createPendingOrderRequest.getCustomerId());
-		Template t = velocityEngine.getTemplate("sms.vm");
-		VelocityContext context = new VelocityContext();
-		context.put("customer", customer.getFirstName());
-		context.put("invoiceNumber", returnMap.get("poid"));
-		StringWriter writer = new StringWriter();
-		t.merge(context, writer);
-		sendMailWithAttachments("Order Confirmation", writer.toString());
 		return responseSender.ok(returnMap);
+	}
 	private void sendMailWithAttachments(String subject, String messageText) throws Exception {
 					customerOrderDetail.setId(poi.getOrderId());
 					customerOrderDetail.setItemId(poi.getItemId());
 					customerOrderDetail.setModelName(item.getModelName());
 					customerOrderDetail.setModelNumber(item.getModelNumber());
 					customerOrderDetail.setQuantity(poi.getQuantity());
+					customerOrderDetail.setBilledTimestamp(poi.getBilledTimestamp());
-					customerOrderDetail.setStatus(po.getStatus());
+					customerOrderDetail.setStatus(poi.getStatus());
 					customerOrderDetail.setTotalPrice(poi.getSellingPrice());
 					customerOrderDetail.setPayMethod(po.getPayMethod());
 					customerOrderDetail.setCreatedTimeStamp(po.getCreateTimestamp());
 					customerOrderDetails.add(customerOrderDetail);
+				}
 			@RequestParam(value = "q", required = false) String queryTerm,
 			@RequestParam(value = " ", required = false, defaultValue = "true") boolean partnerStockOnly)
 			throws Throwable {
 		List<FofoCatalogResponse> dealResponse = new ArrayList<>();
 		UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
+		dealResponse = this.getCatalogResponse(
-		dealResponse = this.getCatalogResponse(solrService.getSolrDocs(queryTerm, categoryId, offset, limit,
+				solrService.getSolrDocs(queryTerm, categoryId, offset, limit, sort, brand, subCategoryId, false), false,
-				sort, brand, subCategoryId, false), false, userInfo.getRetailerId());
+				userInfo.getRetailerId());
 		return responseSender.ok(dealResponse);
+	}
 	private List<FofoCatalogResponse> getCatalogResponse(JSONArray docs, boolean hotDeal, int fofoId)
 			throws ProfitMandiBusinessException {
 		return responseSender.ok(pendingOrder);
+	}
 	@RequestMapping(value = "/store/addresses/{customerId}", method = RequestMethod.GET)
 	public ResponseEntity<?> getAll(HttpServletRequest request, @PathVariable int customerId) throws Throwable {
-		return responseSender.ok(customerAddressRepository.selectByCustomerId(customerId));
+		return responseSender.ok(customerAddressRepository.selectByActiveCustomerId(customerId));
+	}
 	@RequestMapping(value = "/store/address", method = RequestMethod.POST)
 	public ResponseEntity<?> addAddress(HttpServletRequest request, @RequestBody CustomerAddress customerAddress)
 			throws Throwable {
 		customerAddressRepository.persist(customerAddress);
 		return responseSender.ok(customerAddress);
+	}
+	@RequestMapping(value = "/store/deactivateCustomerAddress", method = RequestMethod.POST)
+	public ResponseEntity<?> deactivateAddresss(HttpServletRequest request, @RequestParam int id) throws Throwable {
+		CustomerAddress cust = customerAddressRepository.selectById(id);
+		cust.setActive(false);
+		return responseSender.ok(cust);
+	}
 	@RequestMapping(value = "/store/updateCustomer", method = RequestMethod.POST)
 	public ResponseEntity<?> updateCustomerProfile(HttpServletRequest request, @RequestBody Customer customer)
 			throws Throwable {
 		Customer cust = customerRepository.selectById(customer.getId());
 		cust.setGender(customer.getGender());
 		cust.setProfileImageId(customer.getProfileImageId());
 		cust.setDob(customer.getDob());
 		return responseSender.ok(cust);
+	}
+	/*
+	 * @RequestMapping(value = "/cancelPendingOrderItem", method =
+	 * RequestMethod.POST) public ResponseEntity<?>
+	 * cancelPendingOrderItem(HttpServletRequest request, @RequestParam int id,
+	 *
+	 * @RequestParam String statusDescription) throws Exception {
+	 *
+	 * PendingOrderItem pendingOrderItem =
+	 * pendingOrderItemRepository.selectById(id);
+	 *
+	 * PendingOrder pendingOrder =
+	 * pendingOrderRepository.selectById(pendingOrderItem.getId()); if
+	 * (pendingOrderItem.getBilledTimestamp() == null) {
+	 * pendingOrderItem.setStatus(OrderStatus.CANCELLED);
+	 * pendingOrderItem.setStatusDescription(statusDescription); List<OrderStatus>
+	 * status =
+	 * pendingOrderItemRepository.selectByOrderId(pendingOrderItem.getOrderId())
+	 * .stream().map(x -> x.getStatus()).collect(Collectors.toList());
+	 *
+	 * if (!status.contains(OrderStatus.PENDING)) {
+	 * pendingOrder.setStatus(OrderStatus.CLOSED); }
+	 *
+	 * pendingOrderItemRepository.persist(pendingOrderItem); }
+	 *
+	 * return responseSender.ok(true);
+	 *
+	 * }
+	 */
+}
 class UserModel {
 	@JsonProperty(required = true)
 	private String mobile;

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java – Rev 27030 → 27045