From 48bb23486bc018d13014d8acde4fb51ec3a78a36 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 24 Sep 2022 11:27:59 +0800
Subject: [PATCH] Merge branch 'group_buy' of http://120.27.238.55:7000/r/xc-mall into group_buy
---
src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java | 84 +++++++++++++++++++++++++++---------------
1 files changed, 54 insertions(+), 30 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 24d5b27..59411bf 100644
--- a/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java
+++ b/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java
@@ -17,6 +17,7 @@
import cn.hutool.core.util.ObjectUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -32,10 +33,14 @@
**/
@Slf4j
@Component
+@ConditionalOnProperty(prefix = "system", name = "job", havingValue = "true")
public class OrderSettlementJob {
@Autowired
private MallOrderInfoMapper mallOrderInfoMapper;
+
+ @Autowired
+ private MallOrderItemMapper mallOrderItemMapper;
@Autowired
private IApiMallMemberWalletService memberWalletService;
@@ -99,7 +104,9 @@
/**
* 自动确认收货
*/
- @Scheduled(cron = "0 0 0 * * ?")
+// @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());
@@ -107,15 +114,34 @@
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());
- BigDecimal subtract = orderInfo.getAmount().subtract(orderInfo.getCarriage() == null ? BigDecimal.ZERO : orderInfo.getCarriage());
- mallLeaderAchieve.setAmount(subtract);
- mallLeaderAchieve.setUniqueCode(orderInfo.getTakeUniqueCode());
- mallLeaderAchieve.setState(MallLeaderAchieve.STATE_ONE);
- mallLeaderAchieveMapper.insert(mallLeaderAchieve);
+ 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));
}
@@ -126,30 +152,28 @@
* 修改业绩的状态
* 并生成一条提成流水
*/
-// @Scheduled(cron = "0 0 1 * * ?")
- @Scheduled(cron = "1 * * * * ?")
+ @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 每日提成总金额
- */
+ //获取每日提成总数
+ /**
+ * 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 amountOrder = map.get("amount");
+// 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 amount = new BigDecimal(String.valueOf(amountOrder)).setScale(2,BigDecimal.ROUND_DOWN);
- BigDecimal achieveMoney = amount.multiply(bonusPercent).setScale(2,BigDecimal.ROUND_DOWN);
+ 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();
--
Gitblit v1.9.1