| Line 57... |
Line 57... |
| 57 |
import com.spice.profitmandi.dao.repository.catalog.TagRankingRepository;
|
57 |
import com.spice.profitmandi.dao.repository.catalog.TagRankingRepository;
|
| 58 |
import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
|
58 |
import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
|
| 59 |
import com.spice.profitmandi.dao.repository.fofo.CurrentInventorySnapshotRepository;
|
59 |
import com.spice.profitmandi.dao.repository.fofo.CurrentInventorySnapshotRepository;
|
| 60 |
import com.spice.profitmandi.dao.repository.fofo.InventoryItemRepository;
|
60 |
import com.spice.profitmandi.dao.repository.fofo.InventoryItemRepository;
|
| 61 |
import com.spice.profitmandi.dao.repository.fofo.LiveDemoBillingRespository;
|
61 |
import com.spice.profitmandi.dao.repository.fofo.LiveDemoBillingRespository;
|
| - |
|
62 |
import com.spice.profitmandi.dao.repository.transaction.OrderRepository;
|
| 62 |
import com.spice.profitmandi.service.inventory.InventoryService;
|
63 |
import com.spice.profitmandi.service.inventory.InventoryService;
|
| 63 |
import com.spice.profitmandi.service.user.RetailerService;
|
64 |
import com.spice.profitmandi.service.user.RetailerService;
|
| 64 |
import com.spice.profitmandi.web.model.LoginDetails;
|
65 |
import com.spice.profitmandi.web.model.LoginDetails;
|
| 65 |
import com.spice.profitmandi.web.util.CookiesProcessor;
|
66 |
import com.spice.profitmandi.web.util.CookiesProcessor;
|
| 66 |
import com.spice.profitmandi.web.util.MVCResponseSender;
|
67 |
import com.spice.profitmandi.web.util.MVCResponseSender;
|
| 67 |
|
68 |
|
| - |
|
69 |
import in.shop2020.model.v1.order.Order;
|
| - |
|
70 |
import in.shop2020.model.v1.order.OrderStatus;
|
| - |
|
71 |
|
| 68 |
@Controller
|
72 |
@Controller
|
| 69 |
@Transactional(rollbackFor = Throwable.class)
|
73 |
@Transactional(rollbackFor = Throwable.class)
|
| 70 |
public class InventoryController {
|
74 |
public class InventoryController {
|
| 71 |
|
75 |
|
| 72 |
private static final Logger LOGGER = LogManager.getLogger(InventoryController.class);
|
76 |
private static final Logger LOGGER = LogManager.getLogger(InventoryController.class);
|
| Line 100... |
Line 104... |
| 100 |
private MVCResponseSender mvcResponseSender;
|
104 |
private MVCResponseSender mvcResponseSender;
|
| 101 |
|
105 |
|
| 102 |
@Autowired
|
106 |
@Autowired
|
| 103 |
FofoStoreRepository fofoStoreRepository;
|
107 |
FofoStoreRepository fofoStoreRepository;
|
| 104 |
|
108 |
|
| - |
|
109 |
@Autowired
|
| - |
|
110 |
private OrderRepository orderRepository;
|
| - |
|
111 |
|
| 105 |
@Value("${saholic.api.host}")
|
112 |
@Value("${saholic.api.host}")
|
| 106 |
private String host;
|
113 |
private String host;
|
| 107 |
|
114 |
|
| 108 |
@Value("${saholic.api.port}")
|
115 |
@Value("${saholic.api.port}")
|
| 109 |
private int port;
|
116 |
private int port;
|
| Line 163... |
Line 170... |
| 163 |
throws ProfitMandiBusinessException {
|
170 |
throws ProfitMandiBusinessException {
|
| 164 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
171 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
| 165 |
if (searchTerm == null) {
|
172 |
if (searchTerm == null) {
|
| 166 |
searchTerm = "";
|
173 |
searchTerm = "";
|
| 167 |
}
|
174 |
}
|
| 168 |
|
175 |
|
| 169 |
Map<String, Object> map = inventoryService.getCatalog(loginDetails.getFofoId(), offset, limit, searchTerm);
|
176 |
Map<String, Object> map = inventoryService.getCatalog(loginDetails.getFofoId(), offset, limit, searchTerm);
|
| 170 |
model.addAllAttributes(map);
|
177 |
model.addAllAttributes(map);
|
| 171 |
model.addAttribute("hasGift", hasGift(loginDetails.getFofoId()));
|
178 |
model.addAttribute("hasGift", hasGift(loginDetails.getFofoId()));
|
| - |
|
179 |
|
| - |
|
180 |
|
| 172 |
return "catalog";
|
181 |
return "catalog";
|
| 173 |
}
|
182 |
}
|
| 174 |
|
183 |
|
| 175 |
// This method is currently hardcoded to faciliate watches sold as gift.
|
184 |
// This method is currently hardcoded to faciliate watches sold as gift.
|
| 176 |
private boolean hasGift(int fofoId) {
|
185 |
private boolean hasGift(int fofoId) {
|
| Line 413... |
Line 422... |
| 413 |
}
|
422 |
}
|
| 414 |
inventoryItem = inventoryItemRepository.selectByFofoIdItemIds(fofoId, itemIds);
|
423 |
inventoryItem = inventoryItemRepository.selectByFofoIdItemIds(fofoId, itemIds);
|
| 415 |
|
424 |
|
| 416 |
Set<String> serial = new HashSet<>();
|
425 |
Set<String> serial = new HashSet<>();
|
| 417 |
for (InventoryItem invItem : inventoryItem) {
|
426 |
for (InventoryItem invItem : inventoryItem) {
|
| 418 |
if(!serailNumberList.contains(invItem.getSerialNumber()))
|
427 |
if (!serailNumberList.contains(invItem.getSerialNumber())) {
|
| 419 |
{
|
- |
|
| 420 |
inventoryItem1.add(invItem);
|
428 |
inventoryItem1.add(invItem);
|
| 421 |
}
|
429 |
}
|
| 422 |
|
430 |
|
| 423 |
}
|
431 |
}
|
| 424 |
|
432 |
|
| 425 |
|
- |
|
| 426 |
LOGGER.info("inventoyItem" + inventoryItem1);
|
433 |
LOGGER.info("inventoyItem" + inventoryItem1);
|
| 427 |
model.addAttribute("customRetailers", customRetailers);
|
434 |
model.addAttribute("customRetailers", customRetailers);
|
| 428 |
model.addAttribute("liveDemo", inventoryItem1);
|
435 |
model.addAttribute("liveDemo", inventoryItem1);
|
| 429 |
|
436 |
|
| 430 |
CustomRetailer fofoIdsAndRetailerName = retailerService.getFofoRetailer(fofoId);
|
437 |
CustomRetailer fofoIdsAndRetailerName = retailerService.getFofoRetailer(fofoId);
|
| Line 452... |
Line 459... |
| 452 |
liveDemoBillingRespository.persist(liveDemoSerialNumber);
|
459 |
liveDemoBillingRespository.persist(liveDemoSerialNumber);
|
| 453 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
460 |
model.addAttribute("response", mvcResponseSender.createResponseString(true));
|
| 454 |
return "response";
|
461 |
return "response";
|
| 455 |
}
|
462 |
}
|
| 456 |
|
463 |
|
| - |
|
464 |
@RequestMapping(value = "/getCurrentOrder")
|
| - |
|
465 |
public String getCurrentOrder(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
|
| - |
|
466 |
List<com.spice.profitmandi.dao.entity.transaction.Order> inProcessorder = orderRepository.selectAllOrderBeforeTwoDaysByStatus(OrderStatus.SUBMITTED_FOR_PROCESSING);
|
| - |
|
467 |
List<com.spice.profitmandi.dao.entity.transaction.Order> pendingPaymentorder = orderRepository.selectAllOrderofOneMonthByStatus(OrderStatus.PAYMENT_PENDING);
|
| - |
|
468 |
List<com.spice.profitmandi.dao.entity.transaction.Order> failedPaymentorder = orderRepository.selectAllOrderofOneMonthByStatus(OrderStatus.PAYMENT_FAILED);
|
| - |
|
469 |
pendingPaymentorder.addAll(failedPaymentorder);
|
| - |
|
470 |
|
| - |
|
471 |
model.addAttribute("inProcessorder",inProcessorder);
|
| - |
|
472 |
model.addAttribute("pendingPaymentorder",pendingPaymentorder);
|
| - |
|
473 |
|
| - |
|
474 |
LOGGER.info("failedPaymentorder" + failedPaymentorder);
|
| - |
|
475 |
return "review_order";
|
| - |
|
476 |
}
|
| - |
|
477 |
|
| 457 |
}
|
478 |
}
|