Subversion Repositories SmartDukaan

Rev

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

Rev 35104 Rev 35116
Line 41... Line 41...
41 
        ProfitMandiConstants.BRAND_REWARD_REGION_IDS.forEach(regionId -> {
 41 
        ProfitMandiConstants.BRAND_REWARD_REGION_IDS.forEach(regionId -> {
42 
            List<EligibleRewardItemsModel> eligibleRewardItemsModelList = selectBrandItemsByRegionAndDate(regionId,"Oppo", date);
 42 
            List<EligibleRewardItemsModel> eligibleRewardItemsModelList = selectBrandItemsByRegionAndDate(regionId,"Oppo", date);
43 
 
 43 
 
44 
            for (EligibleRewardItemsModel item : eligibleRewardItemsModelList) {
 44 
            for (EligibleRewardItemsModel item : eligibleRewardItemsModelList) {
45 
                logger.info("rewardHistories after item: {}", item);
 45 
                logger.info("rewardHistories after item: {}", item);
46 
                    ModelRewardPoints modelReward = modelRewardPointsRepository.findByCatalogAndRegionId(item.getCatalogId(), regionId);
 46 
                ModelRewardPoints modelReward = modelRewardPointsRepository.findByCatalogAndRegionId(item.getCatalogId(), regionId);
47 
                    logger.info("modelReward after item: {}", modelReward);
 47 
                logger.info("modelReward after item: {}", modelReward);
48 
 
 48 
 
49 
                    BigDecimal rewardPoints;
 49 
                BigDecimal rewardPoints;
50 
 
 50 
 
51 
                    if (modelReward != null) {
 51 
                if (modelReward != null) {
52 
                        rewardPoints = BigDecimal.valueOf(modelReward.getPoints());
 52 
                    rewardPoints = BigDecimal.valueOf(modelReward.getPoints());
53 
                    } else {
 53 
                } else {
54 
                        rewardPoints = BigDecimal.valueOf(ProfitMandiConstants.getRewardPoint(item.getDp()));
 54 
                    rewardPoints = BigDecimal.valueOf(ProfitMandiConstants.getRewardPoint(item.getDp()));
55 
                    }
 55 
                }
56 
                    logger.info("rewardPoints after item: {}", rewardPoints);
 56 
                logger.info("rewardPoints after item: {}", rewardPoints);
57 
 
 57 
 
58 
                    SaleRewardHistory saleRewardHistory = new SaleRewardHistory();
 58 
                SaleRewardHistory saleRewardHistory = new SaleRewardHistory();
59 
                    saleRewardHistory.setCatalogId(item.getCatalogId());
 59 
                saleRewardHistory.setCatalogId(item.getCatalogId());
60 
                    saleRewardHistory.setFofoId(item.getFofoStoreId());
 60 
                saleRewardHistory.setFofoId(item.getFofoStoreId());
61 
                    saleRewardHistory.setOrderId(item.getOrderId());
 61 
                saleRewardHistory.setOrderId(item.getOrderId());
62 
                    saleRewardHistory.setPointEarned(rewardPoints);
 62 
                saleRewardHistory.setPointEarned(rewardPoints);
63 
                    saleRewardHistory.setImeis(item.getSerialNumber());
 63 
                saleRewardHistory.setImeis(item.getSerialNumber());
64 
                    saleRewardHistory.setQty(item.getQuantity());
 64 
                saleRewardHistory.setQty(item.getQuantity());
65 
                    saleRewardHistoryRepository.persist(saleRewardHistory);
 65 
                saleRewardHistoryRepository.persist(saleRewardHistory);
66 
            }
 66 
            }
67 
        });
 67 
        });
68 
 
 68 
 
69 
    }
 69 
    }
70 
 
 70 
 
Line 88... Line 88...
88 
                .filter(Objects::nonNull)
 88 
                .filter(Objects::nonNull)
89 
                .mapToDouble(p -> p.doubleValue())
 89 
                .mapToDouble(p -> p.doubleValue())
90 
                .sum();
 90 
                .sum();
91 
 
 91 
 
92 
        List<BrandSalesRewards> brandSalesRewardsList = modelRewardPointsRepository.selectAllByRegionId(regionId);
 92 
        List<BrandSalesRewards> brandSalesRewardsList = modelRewardPointsRepository.selectAllByRegionId(regionId);
93 
 
 - 
 
- 
 
 93 
        BrandSalesRewards reward = null;
- 
 
 94 
        if (regionId == 19) {
94 
        BrandSalesRewards reward = brandSalesRewardsList.stream()
 95 
            reward = brandSalesRewardsList.stream()
95 
                .filter(r -> r.getSalesScore() <= (int) Math.floor(totalPoints))
 96 
                    .filter(r -> r.getSalesScore() <= (int) Math.floor(totalPoints))
96 
                .max(Comparator.comparingInt(BrandSalesRewards::getSalesScore))
 97 
                    .max(Comparator.comparingInt(BrandSalesRewards::getSalesScore))
- 
 
 98 
                    .orElse(null);
- 
 
 99 
        } else {
- 
 
 100 
            reward = brandSalesRewardsList.stream()
- 
 
 101 
                    .filter(r -> totalQuantity >= r.getSalesScore() && totalQuantity <= r.getPerPointBonus())
- 
 
 102 
                    .findFirst()
97 
                .orElse(null);
 103 
                    .orElse(null);
- 
 
 104 
        }
98 
        logger.info("reward after item: {}", reward);
 105 
        logger.info("reward after item: {}", reward);
99 
 
 106 
 
100 
        Map<String, Object> map = Maps.newHashMap();
 107 
        Map<String, Object> map = Maps.newHashMap();
101 
        map.put("quantity",totalQuantity);
 108 
        map.put("quantity",totalQuantity);
102 
        map.put("points",totalPoints);
 109 
        map.put("points",totalPoints);