赠送积分更新状态

xiaoyong931011

2023-08-14 a7826c5e4f0a02ba88446e60456f62c2c3ef13ec

赠送积分更新状态

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

@@ -69,6 +69,9 @@
    @Autowired
    private IMallAchieveService mallAchieveService;

    @Autowired
    private MallMoneyFlowMapper mallMoneyFlowMapper;

    /**
     * 普通商品结算
     */
@@ -105,44 +108,26 @@
     * 自动确认收货
     */
    @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());
        Integer value = Integer.parseInt(dic.getValue());
        List<MallOrderInfo> orderInfos = mallOrderInfoMapper.selectOrderByStatusAndPayTime(3,DateUtil.offsetDay(new Date(), -value));
        if(CollUtil.isNotEmpty(orderInfos)){
//            for(MallOrderInfo orderInfo : orderInfos){
//                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);
//                            }
//                        }
//                    }
//                }
//            }
            for(MallOrderInfo orderInfo : orderInfos){
                MallMember mallMember = mallMemberMapper.selectById(orderInfo.getMemberId());
                if(ObjectUtil.isNotEmpty(mallMember.getReferrerId())){
                    String referrerId = mallMember.getReferrerId();
                    MallMember mallMemberParent = mallMemberMapper.selectInfoByInviteId(referrerId);
                    Long parentId = mallMemberParent.getId();
                    String orderNo = orderInfo.getOrderNo();
                    MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOneByOrderNoAndMemberIdAndRtMemberId(orderNo, mallMember.getId(), parentId);
                    mallMoneyFlow.setStatus(2);
                    mallMoneyFlow.setIsReturn(1);
                    mallMoneyFlowMapper.updateById(mallMoneyFlow);
                    memberWalletService.add(mallMoneyFlow.getAmount(), parentId, "balance");
                }
            }
            mallOrderInfoMapper.updateOrderConfirmStatus(DateUtil.date(),DateUtil.offsetDay(new Date(), -value));
        }
    }

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

@@ -657,37 +657,9 @@
            mallMoneyFlow.setStatus(2);
            mallMoneyFlow.setIsReturn(1);
            mallMoneyFlowMapper.updateById(mallMoneyFlow);
            memberWalletService.add(mallMoneyFlow.getAmount(), id, "balance");
            memberWalletService.add(mallMoneyFlow.getAmount(), parentId, "balance");
        }

        //生成一条团长提成记录
//        Long orderInfoId = orderInfo.getId();
//        List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(orderInfoId);
//        if(CollUtil.isNotEmpty(mallOrderItemList)){
//
//            MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(orderInfo.getTakeUniqueCode());
//            Integer profitSwitch = mallTeamLeader.getProfitSwitch()==null?2:mallTeamLeader.getProfitSwitch();
//            BigDecimal bonusPercent =new BigDecimal(mallTeamLeader.getBonusPercent()==null?"0":mallTeamLeader.getBonusPercent());
//
//            if(1 == profitSwitch){
//                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);
//                    }
//                }
//            }
//        }
    }

    @Override

 src/main/java/cc/mrbird/febs/pay/util/WechatConfigure.java

@@ -42,7 +42,10 @@
    public static final String MINIPROGRAM_APPID = "wx5cc58f796224af61";

    // 企业付款API
    public static final String COM_PAY_API="https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers";
    public static final String COM_PAY_API="https://api.mch.weixin.qq.com/v3/transfer/batches";

    // 企业付款API
//    public static final String COM_PAY_API="https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers";

    // 退款API
    public static final String REFUND_API = "https://api.mch.weixin.qq.com/secapi/pay/refund";