20220902

xiaoyong931011

2022-09-05 d59841d7697f95cc945f9c46eee72546b8d032cc

20220902

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

@@ -111,7 +111,8 @@
                MallLeaderAchieve mallLeaderAchieve = new MallLeaderAchieve();
                mallLeaderAchieve.setMemberId(orderInfo.getMemberId());
                mallLeaderAchieve.setOrderNo(orderInfo.getOrderNo());
                mallLeaderAchieve.setAmount(orderInfo.getAmount());
                BigDecimal subtract = orderInfo.getAmount().subtract(orderInfo.getCarriage() == null ? BigDecimal.ZERO : orderInfo.getCarriage());
                mallLeaderAchieve.setAmount(subtract);
                mallLeaderAchieve.setUniqueCode(orderInfo.getTakeUniqueCode());
                mallLeaderAchieve.setState(MallLeaderAchieve.STATE_ONE);
                mallLeaderAchieveMapper.insert(mallLeaderAchieve);
@@ -120,7 +121,10 @@
        }
    }
    /**
     * 自动确认收货
     * 团长第二天才会结算前一天的所有提成
     * 从团长业绩表中查询出前一天的所有已完成订单金额*提成系数，得到今日提成
     * 修改业绩的状态
     * 并生成一条提成流水
     */
//    @Scheduled(cron = "0 0 1 * * ?")
    @Scheduled(cron = "1 * * * * ?")

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java

@@ -491,7 +491,8 @@
        MallLeaderAchieve mallLeaderAchieve = new MallLeaderAchieve();
        mallLeaderAchieve.setMemberId(orderInfo.getMemberId());
        mallLeaderAchieve.setOrderNo(orderInfo.getOrderNo());
        mallLeaderAchieve.setAmount(orderInfo.getAmount());
        BigDecimal subtract = orderInfo.getAmount().subtract(orderInfo.getCarriage() == null ? BigDecimal.ZERO : orderInfo.getCarriage());
        mallLeaderAchieve.setAmount(subtract);
        mallLeaderAchieve.setUniqueCode(orderInfo.getTakeUniqueCode());
        mallLeaderAchieve.setState(MallLeaderAchieve.STATE_ONE);
        mallLeaderAchieveMapper.insert(mallLeaderAchieve);