订单发货设置

xiaoyong931011

2023-02-13 99298d5dd3228d36807f02c08f189f7fd2573a81

订单发货设置

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

@@ -72,34 +72,34 @@
    /**
     * 普通商品结算
     */
    @Scheduled(cron = "0 0 0 * * ?")
    public void normalGoodsSettlementJob() {
        log.info("普通商品结算");
        List<MallOrderInfo> orderInfos = mallOrderInfoMapper.selectOrderInfoWithNormalGoods(DateUtil.offsetDay(new Date(), -10));
        if (CollUtil.isEmpty(orderInfos)) {
            return;
        }

        for (MallOrderInfo orderInfo : orderInfos) {
            MallMember member = mallMemberMapper.selectById(orderInfo.getMemberId());
            if (AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())) {
                continue;
            }

            for (MallOrderItem item : orderInfo.getItems()) {
                MallGoodsSku sku = mallGoodsSkuMapper.selectById(item.getSkuId());
                BigDecimal score = sku.getPresentPrice();

                memberWalletService.add(score, member.getId(), "score");
                mallMoneyFlowService.addMoneyFlow(member.getId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());

                mallAchieveService.add(item.getId());
            }

            // 普通商品动态分红结算
            memberProfitService.dynamicProfit(orderInfo.getId(), 1);
        }
    }
//    @Scheduled(cron = "0 0 0 * * ?")
//    public void normalGoodsSettlementJob() {
//        log.info("普通商品结算");
//        List<MallOrderInfo> orderInfos = mallOrderInfoMapper.selectOrderInfoWithNormalGoods(DateUtil.offsetDay(new Date(), -10));
//        if (CollUtil.isEmpty(orderInfos)) {
//            return;
//        }
//
//        for (MallOrderInfo orderInfo : orderInfos) {
//            MallMember member = mallMemberMapper.selectById(orderInfo.getMemberId());
//            if (AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())) {
//                continue;
//            }
//
//            for (MallOrderItem item : orderInfo.getItems()) {
//                MallGoodsSku sku = mallGoodsSkuMapper.selectById(item.getSkuId());
//                BigDecimal score = sku.getPresentPrice();
//
//                memberWalletService.add(score, member.getId(), "score");
//                mallMoneyFlowService.addMoneyFlow(member.getId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
//
//                mallAchieveService.add(item.getId());
//            }
//
//            // 普通商品动态分红结算
//            memberProfitService.dynamicProfit(orderInfo.getId(), 1);
//        }
//    }

    /**
     * 自动确认收货
@@ -113,36 +113,36 @@
        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){
//                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);
//                            }
//                        }
//                    }
//                }
//            }
            mallOrderInfoMapper.updateOrderConfirmStatus(DateUtil.date(),DateUtil.offsetDay(new Date(), -value));
        }
    }
@@ -152,44 +152,44 @@
     * 修改业绩的状态
     * 并生成一条提成流水
     */
    @Scheduled(cron = "0 0 1 * * ?")
//    @Scheduled(cron = "1 * * * * ?")
    public void leaderAchieveAuto() {
        log.info("团长每日提成");
        //获取每日提成总数
        /**
         * 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 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();
                    mallMoneyFlowService.addMoneyFlow(
                            mallMember.getId(),
                            achieveMoney,
                            MoneyFlowTypeEnum.LEADERACHIEVE.getValue(),
                            achieveNo,
                            FlowTypeEnum.BALANCE.getValue());

                    //更新到已提成状态
                    mallLeaderAchieveMapper.updateByUniqueCodeStateAndTime(DateUtil.date(),uniqueCode,MallLeaderAchieve.STATE_ONE,dateTime);
                }
            }
        }
    }
//    @Scheduled(cron = "0 0 1 * * ?")
////    @Scheduled(cron = "1 * * * * ?")
//    public void leaderAchieveAuto() {
//        log.info("团长每日提成");
//        //获取每日提成总数
//        /**
//         * 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 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();
//                    mallMoneyFlowService.addMoneyFlow(
//                            mallMember.getId(),
//                            achieveMoney,
//                            MoneyFlowTypeEnum.LEADERACHIEVE.getValue(),
//                            achieveNo,
//                            FlowTypeEnum.BALANCE.getValue());
//
//                    //更新到已提成状态
//                    mallLeaderAchieveMapper.updateByUniqueCodeStateAndTime(DateUtil.date(),uniqueCode,MallLeaderAchieve.STATE_ONE,dateTime);
//                }
//            }
//        }
//    }

//    public static void main(String[] args) {
//        BigDecimal bigDecimal = new BigDecimal(0.1256).setScale(2,BigDecimal.ROUND_DOWN);

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

@@ -39,41 +39,41 @@
    @Autowired
    private IMemberProfitService memberProfitService;

    /**
     * 代理分红
     */
    @Scheduled(cron = "0 30 0 * * ?")
    public void profitJob() {
        memberProfitService.agentProfit(null);
    }

    @Scheduled(cron = "0 30 1 * * ?")
    public void storeAndDirectorJob() {
        memberProfitService.storeAndDirectorProfit(null);
    }

    /**
     * 感恩奖
     */
    @Scheduled(cron = "0 0 1 * * ?")
    public void thankfulJob() {
        memberProfitService.thankfulProfit(null);
    }


    /**
     * 静态分红
     */
    @Scheduled(cron = "0 0 0 * * ?")
    public void staticProfitJob() {
        memberProfitService.staticProfit(null);
    }

    /**
     * 排名奖 每月1号
     */
    @Scheduled(cron = "0 30 0 1 * ?")
    public void rankJob() {
        memberProfitService.rankProfit();
    }
//    /**
//     * 代理分红
//     */
//    @Scheduled(cron = "0 30 0 * * ?")
//    public void profitJob() {
//        memberProfitService.agentProfit(null);
//    }
//
//    @Scheduled(cron = "0 30 1 * * ?")
//    public void storeAndDirectorJob() {
//        memberProfitService.storeAndDirectorProfit(null);
//    }
//
//    /**
//     * 感恩奖
//     */
//    @Scheduled(cron = "0 0 1 * * ?")
//    public void thankfulJob() {
//        memberProfitService.thankfulProfit(null);
//    }
//
//
//    /**
//     * 静态分红
//     */
//    @Scheduled(cron = "0 0 0 * * ?")
//    public void staticProfitJob() {
//        memberProfitService.staticProfit(null);
//    }
//
//    /**
//     * 排名奖 每月1号
//     */
//    @Scheduled(cron = "0 30 0 1 * ?")
//    public void rankJob() {
//        memberProfitService.rankProfit();
//    }
}

 src/main/resources/application-dev.yml

@@ -72,11 +72,11 @@
  xcx_appid: wxfb1acf504eb9d058
  xcx_secret: 7ee226a964b1be7cfb96f5e0dc739c44
  debug: false
  wecharPaynotifyUrl: http://groupbuy.csxuncong.com/api/xcxPay/wxpayCallback
  wecharRechargePaynotifyUrl: http://groupbuy.csxuncong.com/api/xcxPay/rechargeCallBack
  certLocalPath: /home/yyscCert/apiclient_cert.p12
  wecharpayMchid: 1631084809
  wecharpaySecret: YYSC13875978057YYSC13875978057SH
  wecharPaynotifyUrl: http://qianayi.csxuncong.com/api/xcxPay/wxpayCallback
  wecharRechargePaynotifyUrl: http://qianayi.csxuncong.com/api/xcxPay/rechargeCallBack
  certLocalPath: /home/qianayiCert/apiclient_cert.p12
  wecharpayMchid: 1638095860
  wecharpaySecret: QIANAYIZONGZI1234567899876543212
  gaodeKey: 95ede7157929f5f6b6c758971be924b1
  serviceName: yiyuanshucai


 src/main/resources/application-prod.yml

@@ -70,9 +70,9 @@
  debug: false
  wecharPaynotifyUrl: http://qianayi.csxuncong.com/api/xcxPay/wxpayCallback
  wecharRechargePaynotifyUrl: http://qianayi.csxuncong.com/api/xcxPay/rechargeCallBack
  certLocalPath: /home/yyscCert/apiclient_cert.p12
  wecharpayMchid: 1631084809
  wecharpaySecret: YYSC13875978057YYSC13875978057SH
  certLocalPath: /home/qianayiCert/apiclient_cert.p12
  wecharpayMchid: 1638095860
  wecharpaySecret: QIANAYIZONGZI1234567899876543212
  gaodeKey: 95ede7157929f5f6b6c758971be924b1
  serviceName: yiyuanshucai