Subversion Repositories SmartDukaan

Rev

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

Rev 33298 Rev 33399
Line 223... Line 223...
223 
 
 223 
 
224 
    @Autowired
 224 
    @Autowired
225 
    private PendingOrderRepository pendingOrderRepository;
 225 
    private PendingOrderRepository pendingOrderRepository;
226 
 
 226 
 
227 
    @Autowired
 227 
    @Autowired
- 
 
 228 
 
- 
 
 229 
    private PendingOrderService pendingOrderService;
- 
 
 230 
 
- 
 
 231 
    @Autowired
228 
    private PendingOrderItemRepository pendingOrderItemRepository;
 232 
    private PendingOrderItemRepository pendingOrderItemRepository;
229 
 
 233 
 
230 
    @Autowired
 234 
    @Autowired
231 
    private ScratchOfferRepository scratchOfferRepository;
 235 
    private ScratchOfferRepository scratchOfferRepository;
232 
 
 236 
 
Line 258... Line 262...
258 
        Map<Integer, CustomFofoOrderItem> itemIdCustomFofoOrderItemMap = new HashMap<>();
 262 
        Map<Integer, CustomFofoOrderItem> itemIdCustomFofoOrderItemMap = new HashMap<>();
259 
        Map<Integer, Float> lineItemPrice = new HashMap<>(); // this is for pricing error
 263 
        Map<Integer, Float> lineItemPrice = new HashMap<>(); // this is for pricing error
260 
 
 264 
 
261 
        float totalAmount = 0;
 265 
        float totalAmount = 0;
262 
        boolean noGST = false;
 266 
        boolean noGST = false;
- 
 
 267 
        int changedTotalBillAmount=0;
- 
 
 268 
        for(CustomPaymentOption cpo : createOrderRequest.getPaymentOptions()){
- 
 
 269 
            changedTotalBillAmount += cpo.getAmount();
- 
 
 270 
        }
263 
        for (CustomFofoOrderItem customFofoOrderItem : createOrderRequest.getFofoOrderItems()) {
 271 
        for (CustomFofoOrderItem customFofoOrderItem : createOrderRequest.getFofoOrderItems()) {
- 
 
 272 
            if(customFofoOrderItem.getPoiId() > 0){
- 
 
 273 
                PendingOrderItem pendingOrderItem = pendingOrderItemRepository.selectById(customFofoOrderItem.getPoiId());
- 
 
 274 
                if(customFofoOrderItem.getQuantity() > pendingOrderItem.getQuantity()){
- 
 
 275 
                    throw new ProfitMandiBusinessException("itemIdQuantity", customFofoOrderItem.getItemId(), "Quantity should not be greator than order item quantity");
- 
 
 276 
                }
- 
 
 277 
                if(pendingOrderItem.getQuantity() > customFofoOrderItem.getQuantity()){
- 
 
 278 
                    pendingOrderService.duplicatePendingOrder(pendingOrderItem,customFofoOrderItem.getQuantity(),changedTotalBillAmount);
- 
 
 279 
                }
- 
 
 280 
            }
264 
            // itemIds.add(customFofoOrderItem.getItemId());
 281 
            // itemIds.add(customFofoOrderItem.getItemId());
265 
            Set<String> serialNumbers = this.serialNumberDetailsToSerialNumbers(customFofoOrderItem.getSerialNumberDetails());
 282 
            Set<String> serialNumbers = this.serialNumberDetailsToSerialNumbers(customFofoOrderItem.getSerialNumberDetails());
266 
            if (!serialNumbers.isEmpty() && customFofoOrderItem.getQuantity() != serialNumbers.size()) {
 283 
            if (!serialNumbers.isEmpty() && customFofoOrderItem.getQuantity() != serialNumbers.size()) {
267 
                itemIdQuantity.put(customFofoOrderItem.getItemId(), customFofoOrderItem.getQuantity());
 284 
                itemIdQuantity.put(customFofoOrderItem.getItemId(), customFofoOrderItem.getQuantity());
268 
            }
 285 
            }
Line 553... Line 570...
553 
        schemeService.processSchemeOut(fofoOrder.getId(), fofoId);
 570 
        schemeService.processSchemeOut(fofoOrder.getId(), fofoId);
554 
 
 571 
 
555 
        if (createOrderRequest.getPoId() != 0) {
 572 
        if (createOrderRequest.getPoId() != 0) {
556 
            PendingOrder po = pendingOrderRepository.selectById(createOrderRequest.getPoId());
 573 
            PendingOrder po = pendingOrderRepository.selectById(createOrderRequest.getPoId());
557 
            po.setBilledAmount(po.getBilledAmount() + totalAmount);
 574 
            po.setBilledAmount(po.getBilledAmount() + totalAmount);
- 
 
 575 
            for(CustomFofoOrderItem cfoi : createOrderRequest.getFofoOrderItems()){
558 
            PendingOrderItem poi = pendingOrderItemRepository.selectById(createOrderRequest.getPoItemId());
 576 
                PendingOrderItem poi = pendingOrderItemRepository.selectById(cfoi.getPoiId());
559 
            poi.setStatus(OrderStatus.BILLED);
 577 
                poi.setStatus(OrderStatus.BILLED);
560 
            poi.setBilledTimestamp(LocalDateTime.now());
 578 
                poi.setBilledTimestamp(LocalDateTime.now());
- 
 
 579 
            }
- 
 
 580 
 
561 
        }
 581 
        }
562 
        //Process scratch
 582 
        //Process scratch
563 
        this.processScratchOffer(fofoOrder);
 583 
        this.processScratchOffer(fofoOrder);
564 
 
 584 
 
565 
        return fofoOrder.getId();
 585 
        return fofoOrder.getId();