Subversion Repositories SmartDukaan

Rev

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

Rev 34476 Rev 34477
Line 222... Line 222...
222
    private static final List<String> offlineOrders = Arrays.asList("EMIOD", "POD");
222
    private static final List<String> offlineOrders = Arrays.asList("EMIOD", "POD");
223
 
223
 
224
    @Autowired
224
    @Autowired
225
    NavBarRepository navBarRepository;
225
    NavBarRepository navBarRepository;
226
 
226
 
-
 
227
 
227
    @Autowired
228
    @Autowired
228
    BidRepository bidRepository;
229
    BidRepository bidRepository;
229
 
230
 
230
    List<String> filterableParams = Arrays.asList("brand");
231
    List<String> filterableParams = Arrays.asList("brand");
231
 
232
 
Line 325... Line 326...
325
        } catch (Exception e) {
326
        } catch (Exception e) {
326
            return responseSender.ok(new CustomerModel(false, null));
327
            return responseSender.ok(new CustomerModel(false, null));
327
        }
328
        }
328
    }
329
    }
329
 
330
 
-
 
331
 
330
    @RequestMapping(value = "/store/getCustomerById/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
332
    @RequestMapping(value = "/store/getCustomerById/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
331
    public ResponseEntity<?> getCustomerById(HttpServletRequest request, @PathVariable int id) throws Exception {
333
    public ResponseEntity<?> getCustomerById(HttpServletRequest request, @PathVariable int id) throws Exception {
332
 
334
 
333
        Customer customer = customerRepository.selectById(id);
335
        Customer customer = customerRepository.selectById(id);
334
        customer.setPasswordExist(StringUtils.isNotEmpty(customer.getPassword()));
336
        customer.setPasswordExist(StringUtils.isNotEmpty(customer.getPassword()));
Line 1088... Line 1090...
1088
    public ResponseEntity<?> orderStatus(HttpServletRequest request, @PathVariable int pendingOrderId) throws Exception {
1090
    public ResponseEntity<?> orderStatus(HttpServletRequest request, @PathVariable int pendingOrderId) throws Exception {
1089
        PendingOrder pendingOrder = pendingOrderRepository.selectById(pendingOrderId);
1091
        PendingOrder pendingOrder = pendingOrderRepository.selectById(pendingOrderId);
1090
        List<PendingOrderItem> pendingOrderItems = pendingOrderItemRepository.selectByOrderId(pendingOrder.getId());
1092
        List<PendingOrderItem> pendingOrderItems = pendingOrderItemRepository.selectByOrderId(pendingOrder.getId());
1091
        List<Integer> catalogIds = new ArrayList<>();
1093
        List<Integer> catalogIds = new ArrayList<>();
1092
        for (PendingOrderItem pendingOrderItem : pendingOrderItems) {
1094
        for (PendingOrderItem pendingOrderItem : pendingOrderItems) {
-
 
1095
            //TODO : Amit feedback use poItemId instead of poId change Param name
-
 
1096
            // when list is supposed then use method names as selectAllBy instead selectBy of
-
 
1097
            //check for unique constraint
-
 
1098
            List<PendingOrderPlan> policyPlans = pendingOrderPlanRepository.selectByPoId(pendingOrderItem.getId());
-
 
1099
            pendingOrderItem.setPendingOrderItemPolicyPlan(policyPlans);
1093
            Item item = itemRepository.selectById(pendingOrderItem.getItemId());
1100
            Item item = itemRepository.selectById(pendingOrderItem.getItemId());
1094
            pendingOrderItem.setItemName(item.getItemDescription());
1101
            pendingOrderItem.setItemName(item.getItemDescription());
1095
            pendingOrderItem.setCatalogId(item.getCatalogItemId());
1102
            pendingOrderItem.setCatalogId(item.getCatalogItemId());
1096
            catalogIds.add(item.getCatalogItemId());
1103
            catalogIds.add(item.getCatalogItemId());
1097
        }
1104
        }