From 854e2bd522c16327a1be43a4e09e0ff8c795b865 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Thu, 01 Sep 2022 11:56:49 +0800 Subject: [PATCH] 20220822 --- src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java | 94 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 85 insertions(+), 9 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java b/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java index a6a9c01..fa3a580 100644 --- a/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java +++ b/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java @@ -1,16 +1,12 @@ package cc.mrbird.febs.mall.quartz; import cc.mrbird.febs.common.enumerates.AgentLevelEnum; +import cc.mrbird.febs.common.enumerates.DataDictionaryEnum; import cc.mrbird.febs.common.enumerates.FlowTypeEnum; import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum; -import cc.mrbird.febs.mall.entity.MallGoodsSku; -import cc.mrbird.febs.mall.entity.MallMember; -import cc.mrbird.febs.mall.entity.MallOrderInfo; -import cc.mrbird.febs.mall.entity.MallOrderItem; -import cc.mrbird.febs.mall.mapper.MallGoodsSkuMapper; -import cc.mrbird.febs.mall.mapper.MallMemberMapper; -import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper; -import cc.mrbird.febs.mall.mapper.MallOrderItemMapper; +import cc.mrbird.febs.common.utils.MallUtils; +import cc.mrbird.febs.mall.entity.*; +import cc.mrbird.febs.mall.mapper.*; import cc.mrbird.febs.mall.service.IApiMallMemberWalletService; import cc.mrbird.febs.mall.service.IMallAchieveService; import cc.mrbird.febs.mall.service.IMallMoneyFlowService; @@ -18,6 +14,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; @@ -25,7 +22,9 @@ import java.math.BigDecimal; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @author wzy @@ -51,10 +50,25 @@ private MallGoodsSkuMapper mallGoodsSkuMapper; @Autowired + private MallLeaderAchieveMapper mallLeaderAchieveMapper; + + @Autowired + private MallTeamLeaderMapper mallTeamLeaderMapper; + + @Autowired + private DataDictionaryCustomMapper dataDictionaryCustomMapper; + + @Autowired private IMemberProfitService memberProfitService; @Autowired private IMallAchieveService mallAchieveService; + + @Autowired + private IApiMallMemberWalletService memberWalletService; + + @Autowired + private IMallMoneyFlowService mallMoneyFlowService; /** * 普通商品结算 @@ -94,6 +108,68 @@ @Scheduled(cron = "0 0 0 * * ?") public void orderAutoConfirmJob() { log.info("自动确认收货"); - mallOrderInfoMapper.updateOrderConfirmStatus(DateUtil.offsetDay(new Date(), -7)); + 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){ + //生成一条团长提成记录 + 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); + } + mallOrderInfoMapper.updateOrderConfirmStatus(DateUtil.offsetDay(new Date(), -value)); + } + } + /** + * 自动确认收货 + */ +// @Scheduled(cron = "0 0 1 * * ?") + @Scheduled(cron = "1 * * * * ?") + public void leaderAchieveAuto() { + log.info("团长每日提成"); + DataDictionaryCustom dicBonusSwitch = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.BONUS_SWITCH.getType(), DataDictionaryEnum.BONUS_SWITCH.getCode()); + String bonusSwitch = dicBonusSwitch.getValue(); + if("1".equals(bonusSwitch)){ + DataDictionaryCustom dicBonusPercent = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.BONUS_PERCENT.getType(), DataDictionaryEnum.BONUS_PERCENT.getCode()); + BigDecimal bonusPercent = new BigDecimal(dicBonusPercent.getValue()).setScale(2,BigDecimal.ROUND_DOWN);; + //获取每日提成总数 + /** + * a.unique_code uniqueCode 团长特征码 + * , IFNULL(sum(a.amount),0) amount 每日提成总金额 + */ + DateTime dateTime = DateUtil.offsetDay(new Date(), -1); + 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"); + //直接舍弃小数点的第三位 + BigDecimal amount = new BigDecimal(map.get("amount")).setScale(2,BigDecimal.ROUND_DOWN); + BigDecimal achieveMoney = amount.multiply(bonusPercent).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(uniqueCode,MallLeaderAchieve.STATE_ONE,dateTime); + } + } + } + } + + public static void main(String[] args) { + BigDecimal bigDecimal = new BigDecimal(0.1256).setScale(2,BigDecimal.ROUND_DOWN); + System.out.println(bigDecimal); } } -- Gitblit v1.9.1