20220902

xiaoyong931011

2022-09-24 777d32df7c722eec53b8efd5863a64ee12e8a67e

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

@@ -102,7 +102,9 @@
    /**
     * 自动确认收货
     */
    @Scheduled(cron = "0 0 0 * * ?")
//    @Scheduled(cron = "0 0 0 * * ?")

    @Scheduled(cron = "1 * * * * ?")
    public void orderAutoConfirmJob() {
        log.info("自动确认收货");
        DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.OEDER_AUTO_CONFIRM.getType(), DataDictionaryEnum.OEDER_AUTO_CONFIRM.getCode());
@@ -110,22 +112,31 @@
        List<MallOrderInfo> orderInfos = mallOrderInfoMapper.selectOrderByStatusAndPayTime(3,DateUtil.offsetDay(new Date(), -value));
        if(CollUtil.isNotEmpty(orderInfos)){
            for(MallOrderInfo orderInfo : orderInfos){
                //生成一条团长提成记录
                Long id = orderInfo.getId();
                List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(id);
                if(CollUtil.isNotEmpty(mallOrderItemList)){
                    for(MallOrderItem mallOrderItem : mallOrderItemList){
                        Integer state = mallOrderItem.getState() == null ? 1 : mallOrderItem.getState();
                        if(1 == state){
                            MallLeaderAchieve mallLeaderAchieve = new MallLeaderAchieve();
                            mallLeaderAchieve.setMemberId(orderInfo.getMemberId());
                            mallLeaderAchieve.setOrderNo(orderInfo.getOrderNo());
                            BigDecimal itemAmount = mallOrderItem.getAmount();
//                            BigDecimal subtract = orderInfo.getAmount().subtract(orderInfo.getCarriage() == null ? BigDecimal.ZERO : orderInfo.getCarriage());
                            mallLeaderAchieve.setAmount(itemAmount);
                            mallLeaderAchieve.setUniqueCode(orderInfo.getTakeUniqueCode());
                            mallLeaderAchieve.setState(MallLeaderAchieve.STATE_ONE);
                            mallLeaderAchieveMapper.insert(mallLeaderAchieve);
                MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(orderInfo.getTakeUniqueCode());
                Integer profitSwitch = mallTeamLeader.getProfitSwitch()==null?2:mallTeamLeader.getProfitSwitch();
                if(1 == profitSwitch){
                    BigDecimal bonusPercent =new BigDecimal(mallTeamLeader.getBonusPercent()==null?"0":mallTeamLeader.getBonusPercent());
//                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);
                    if(CollUtil.isNotEmpty(mallOrderItemList)){
                        for(MallOrderItem mallOrderItem : mallOrderItemList){
                            Integer state = mallOrderItem.getState() == null ? 1 : mallOrderItem.getState();
                            if(1 == state){
                                MallLeaderAchieve mallLeaderAchieve = new MallLeaderAchieve();
                                mallLeaderAchieve.setMemberId(orderInfo.getMemberId());
                                mallLeaderAchieve.setOrderNo(orderInfo.getOrderNo());
                                mallLeaderAchieve.setOrderItemId(mallOrderItem.getId());
                                BigDecimal itemAmount = mallOrderItem.getAmount();
                                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);
                            }
                        }
                    }
                }
@@ -139,30 +150,28 @@
     * 修改业绩的状态
     * 并生成一条提成流水
     */
//    @Scheduled(cron = "0 0 1 * * ?")
    @Scheduled(cron = "1 * * * * ?")
    @Scheduled(cron = "0 0 1 * * ?")
//    @Scheduled(cron = "1 * * * * ?")
    public void leaderAchieveAuto() {
        log.info("团长每日提成");
        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);;
            //获取每日提成总数
            /**
             * a.unique_code uniqueCode 团长特征码
             * , IFNULL(sum(a.amount),0) amount 每日提成总金额
             */
//            DateTime dateTime = DateUtil.offsetDay(new Date(), -1);
            DateTime dateTime = DateUtil.offsetDay(new Date(), 0);
            List<Map<String, String>> allLeaderAchieve = mallLeaderAchieveMapper.selectListByStateAndCreateTimeAndUniqueCode(MallLeaderAchieve.STATE_ONE,dateTime);
            if (CollUtil.isNotEmpty(allLeaderAchieve)) {
                for (Map<String, String> map : allLeaderAchieve) {
                    String uniqueCode = map.get("uniqueCode");
                    Object amountOrder = map.get("amount");
        //获取每日提成总数
        /**
         * a.unique_code uniqueCode 团长特征码
         * , IFNULL(sum(a.amount),0) amount 每日提成总金额
         */
            DateTime dateTime = DateUtil.offsetDay(new Date(), -1);
//        DateTime dateTime = DateUtil.offsetDay(new Date(), 0);
        List<Map<String, String>> allLeaderAchieve = mallLeaderAchieveMapper.selectListByStateAndCreateTimeAndUniqueCode(MallLeaderAchieve.STATE_ONE,dateTime);
        if (CollUtil.isNotEmpty(allLeaderAchieve)) {
            for (Map<String, String> map : allLeaderAchieve) {
                String uniqueCode = map.get("uniqueCode");
                Object profitAmount = map.get("profitAmount");

                MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(uniqueCode);
                Integer profitSwitch = mallTeamLeader.getProfitSwitch();
                if(1 == profitSwitch){
                    //直接舍弃小数点的第三位
                    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();