20220902

xiaoyong931011

2022-09-06 51542f45e01ff434381ebed7584917bca5b5c197

 src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java

@@ -110,6 +110,8 @@
        List<MallOrderInfo> orderInfos = mallOrderInfoMapper.selectOrderByStatusAndPayTime(3,DateUtil.offsetDay(new Date(), -value));
        if(CollUtil.isNotEmpty(orderInfos)){
            for(MallOrderInfo orderInfo : orderInfos){
                DataDictionaryCustom dicBonusPercent = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.BONUS_PERCENT.getType(), DataDictionaryEnum.BONUS_PERCENT.getCode());
                BigDecimal bonusPercent = new BigDecimal(dicBonusPercent.getValue()).setScale(2,BigDecimal.ROUND_DOWN);
                //生成一条团长提成记录
                Long id = orderInfo.getId();
                List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(id);
@@ -120,9 +122,11 @@
                            MallLeaderAchieve mallLeaderAchieve = new MallLeaderAchieve();
                            mallLeaderAchieve.setMemberId(orderInfo.getMemberId());
                            mallLeaderAchieve.setOrderNo(orderInfo.getOrderNo());
                            mallLeaderAchieve.setOrderItemId(mallOrderItem.getId());
                            BigDecimal itemAmount = mallOrderItem.getAmount();
//                            BigDecimal subtract = orderInfo.getAmount().subtract(orderInfo.getCarriage() == null ? BigDecimal.ZERO : orderInfo.getCarriage());
                            mallLeaderAchieve.setAmount(itemAmount);
                            BigDecimal bigDecimal = bonusPercent.multiply(itemAmount).setScale(2, BigDecimal.ROUND_DOWN);
                            mallLeaderAchieve.setProfitAmount(bigDecimal);
                            mallLeaderAchieve.setUniqueCode(orderInfo.getTakeUniqueCode());
                            mallLeaderAchieve.setState(MallLeaderAchieve.STATE_ONE);
                            mallLeaderAchieveMapper.insert(mallLeaderAchieve);
@@ -146,8 +150,8 @@
        DataDictionaryCustom dicBonusSwitch = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.BONUS_SWITCH.getType(), DataDictionaryEnum.BONUS_SWITCH.getCode());
        String bonusSwitch = dicBonusSwitch.getValue();
        if("1".equals(bonusSwitch)){
            DataDictionaryCustom dicBonusPercent = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.BONUS_PERCENT.getType(), DataDictionaryEnum.BONUS_PERCENT.getCode());
            BigDecimal bonusPercent = new BigDecimal(dicBonusPercent.getValue()).setScale(2,BigDecimal.ROUND_DOWN);;
//            DataDictionaryCustom dicBonusPercent = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.BONUS_PERCENT.getType(), DataDictionaryEnum.BONUS_PERCENT.getCode());
//            BigDecimal bonusPercent = new BigDecimal(dicBonusPercent.getValue()).setScale(2,BigDecimal.ROUND_DOWN);
            //获取每日提成总数
            /**
             * a.unique_code uniqueCode 团长特征码
@@ -159,10 +163,9 @@
            if (CollUtil.isNotEmpty(allLeaderAchieve)) {
                for (Map<String, String> map : allLeaderAchieve) {
                    String uniqueCode = map.get("uniqueCode");
                    Object amountOrder = map.get("amount");
                    Object profitAmount = map.get("profitAmount");
                    //直接舍弃小数点的第三位
                    BigDecimal amount = new BigDecimal(String.valueOf(amountOrder)).setScale(2,BigDecimal.ROUND_DOWN);
                    BigDecimal achieveMoney = amount.multiply(bonusPercent).setScale(2,BigDecimal.ROUND_DOWN);
                    BigDecimal achieveMoney = new BigDecimal(String.valueOf(profitAmount)).setScale(2,BigDecimal.ROUND_DOWN);
                    MallMember mallMember = mallMemberMapper.selectInfoByInviteId(uniqueCode);
                    memberWalletService.addBalance(achieveMoney,mallMember.getId());
                    String achieveNo = "TC."+ MallUtils.getOrderNum();