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

 import com.spice.profitmandi.dao.repository.fofo.*;
 import com.spice.profitmandi.dao.repository.inventory.ItemAvailabilityCacheRepository;
 import com.spice.profitmandi.dao.repository.inventory.StateRepository;
 import com.spice.profitmandi.dao.repository.user.UserRepository;
 import com.spice.profitmandi.dao.repository.webRepository.NavBarRepository;
+import com.spice.profitmandi.dao.service.BidService;
 import com.spice.profitmandi.service.CustomerService;
 import com.spice.profitmandi.service.EmailService;
 import com.spice.profitmandi.service.NotificationService;
 import com.spice.profitmandi.service.authentication.RoleManager;
 import com.spice.profitmandi.service.catalog.BiddingModel;
     private static final List<String> offlineOrders = Arrays.asList("EMIOD", "POD");
     @Autowired
     NavBarRepository navBarRepository;
     @Autowired
     BidRepository bidRepository;
+    @Autowired
+    BidService bidService;
     List<String> filterableParams = Arrays.asList("brand");
     @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")
                     liquidationDetail.setSuperCatalogs(jsonObj.getString("superCatalogVariants_s"));
                     liquidationDetail.setStartDate(liquidation.getStartDate());
                     liquidationDetail.setEndDate(liquidation.getEndDate());
                     liquidationDetail.setSellingPrice(liquidation.getPrice());
                     liquidationDetail.setAvailableQuantity(liquidation.getQuantity());
+                    liquidationDetail.setIncrementStep(liquidation.getIncrementStep());
                     liquidationDetail.setBidList(bidList);
                     resultList.add(liquidationDetail);
+                }
+            }
+        }
     @ApiImplicitParams({@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
     public ResponseEntity<?> saveBidding(HttpServletRequest request, @RequestBody BiddingModel biddingModel) throws Exception {
         LocalDateTime now = LocalDateTime.now();
         Liquidation liquidation = liquidationRepository.selectLiquidationById(biddingModel.getLiquidationId());
         LocalDateTime endDateTime = LocalDateTime.of(liquidation.getEndDate().toLocalDate(), LocalTime.of(ProfitMandiConstants.BID_END_HOUR, ProfitMandiConstants.BID_END_MIN));
+        List<Bid> biddings = bidRepository.selectBidByLiquidationId(biddingModel.getLiquidationId());
         if (now.isAfter(endDateTime)) {
-            return responseSender.badRequest("false");
+            return responseSender.badRequest("Bid on this product has been closed");
+        }
         Bid bid = null;
         UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
         if (biddingModel.getId() != null && biddingModel.getId() > 0) {
             bid = bidRepository.selectById(biddingModel.getId());
             if (bid == null) {
-                throw new Exception("Bidding record not found with ID: " + biddingModel.getId());
+                return responseSender.badRequest("Bidding record not found with ID: " + biddingModel.getId());
+            }
         } else {
             bid = new Bid();
+        }
         logger.info("biddingModel {}: ",biddingModel);
         bid.setFofoId(userInfo.getRetailerId());
         bid.setItemName(biddingModel.getItemName());
         bid.setQuantity(biddingModel.getBidQty());
         bid.setStatus(ProfitMandiConstants.BID_ENUM.PENDING);
         bid.setCreatedAt(LocalDateTime.now());
+        if (biddings.size() > 1) {
+            for (Bid bidding : biddings) {
+                if (!(bid.getFofoId().equals(bidding.getFofoId()))) bidService.notifyPartner(bid.getFofoId(), bidding, ProfitMandiConstants.BID_ENUM.UPDATE);
+            }
+        }
         if (biddingModel.getId() == null) {
             bidRepository.persist(bid);
+        }
+        bidService.notifyPartner(bid.getFofoId(), bid, bid.getStatus());
-        return responseSender.ok("true");
+        return responseSender.ok("Bid placed successfully!");
+    }
+}

Subversion Repositories SmartDukaan

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