20220902

xiaoyong931011

2022-09-06 4f62b86373d07a1ce920914f35ad2d9dff59e0c6

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

@@ -38,6 +38,9 @@
    private MallOrderInfoMapper mallOrderInfoMapper;

    @Autowired
    private MallOrderItemMapper mallOrderItemMapper;

    @Autowired
    private IApiMallMemberWalletService memberWalletService;

    @Autowired
@@ -108,19 +111,33 @@
        if(CollUtil.isNotEmpty(orderInfos)){
            for(MallOrderInfo orderInfo : orderInfos){
                //生成一条团长提成记录
                MallLeaderAchieve mallLeaderAchieve = new MallLeaderAchieve();
                mallLeaderAchieve.setMemberId(orderInfo.getMemberId());
                mallLeaderAchieve.setOrderNo(orderInfo.getOrderNo());
                mallLeaderAchieve.setAmount(orderInfo.getAmount());
                mallLeaderAchieve.setUniqueCode(orderInfo.getTakeUniqueCode());
                mallLeaderAchieve.setState(MallLeaderAchieve.STATE_ONE);
                mallLeaderAchieveMapper.insert(mallLeaderAchieve);
                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);
                        }
                    }
                }
            }
            mallOrderInfoMapper.updateOrderConfirmStatus(DateUtil.date(),DateUtil.offsetDay(new Date(), -value));
        }
    }
    /**
     * 自动确认收货
     * 团长第二天才会结算前一天的所有提成
     * 从团长业绩表中查询出前一天的所有已完成订单金额*提成系数，得到今日提成
     * 修改业绩的状态
     * 并生成一条提成流水
     */
//    @Scheduled(cron = "0 0 1 * * ?")
    @Scheduled(cron = "1 * * * * ?")
@@ -136,8 +153,8 @@
             * a.unique_code uniqueCode 团长特征码
             * , IFNULL(sum(a.amount),0) amount 每日提成总金额
             */
            DateTime dateTime = DateUtil.offsetDay(new Date(), -1);
//            DateTime dateTime = DateUtil.offsetDay(new Date(), 0);
//            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) {