20220902

xiaoyong931011

2022-09-06 4f62b86373d07a1ce920914f35ad2d9dff59e0c6

20220902

 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,15 +111,25 @@
        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 subtract = orderInfo.getAmount().subtract(orderInfo.getCarriage() == null ? BigDecimal.ZERO : orderInfo.getCarriage());
                mallLeaderAchieve.setAmount(subtract);
                            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));
        }
    }

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

@@ -510,15 +510,25 @@
        this.baseMapper.updateById(orderInfo);

        //生成一条团长提成记录
        Long orderInfoId = orderInfo.getId();
        List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(orderInfoId);
        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 subtract = orderInfo.getAmount().subtract(orderInfo.getCarriage() == null ? BigDecimal.ZERO : orderInfo.getCarriage());
        mallLeaderAchieve.setAmount(subtract);
                    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);
    }
            }
        }
    }

    @Override
    public void delOrder(Long id) {