From 6e0861ea3d9d89400abc942ee1be1b2a97e757d1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 16 Aug 2023 10:04:38 +0800
Subject: [PATCH] 赠送积分更新状态
---
src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java | 2 +-
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 4 ++--
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 2 +-
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 1 +
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 2 +-
5 files changed, 6 insertions(+), 5 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 8dd5f57..9f39a44 100644
--- a/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java
+++ b/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java
@@ -121,7 +121,7 @@
MallMember mallMemberParent = mallMemberMapper.selectInfoByInviteId(referrerId);
Long parentId = mallMemberParent.getId();
String orderNo = orderInfo.getOrderNo();
- MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOneByOrderNoAndMemberIdAndRtMemberId(orderNo, mallMember.getId(), parentId);
+ MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOneByOrderNoAndMemberIdAndRtMemberId(orderNo, parentId, mallMember.getId());
mallMoneyFlow.setStatus(2);
mallMoneyFlow.setIsReturn(1);
mallMoneyFlowMapper.updateById(mallMoneyFlow);
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
index 1129921..f098a85 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -383,13 +383,13 @@
BigDecimal amountActual = amountBigDecimal.multiply(returnPercent).setScale(2, BigDecimal.ROUND_DOWN);
mallMoneyFlowService.addMoneyFlow(
- mallMember.getId(),
+ id,
amountActual,
MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(),
mallOrderInfo.getOrderNo(),
"直推奖",
"直推奖",
- id,
+ mallMember.getId(),
1,
FlowTypeEnum.BALANCE.getValue(),
2);
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index ea2579c..7514881 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -516,7 +516,7 @@
}
MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(id);
- commissionVo.setCommission(wallet.getCommission());
+ commissionVo.setCommission(wallet.getBalance());
commissionVo.setToday(mallMoneyFlowMapper.selectCommissionIncome(1, new Date(), id));
commissionVo.setMonth(mallMoneyFlowMapper.selectCommissionIncome(2, new Date(), id));
commissionVo.setTotal(mallMoneyFlowMapper.selectCommissionIncome(null, null, id));
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 23a4e24..2c3fde2 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -686,7 +686,7 @@
MallMember mallMemberParent = memberMapper.selectInfoByInviteId(referrerId);
Long parentId = mallMemberParent.getId();
String orderNo = orderInfo.getOrderNo();
- MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOneByOrderNoAndMemberIdAndRtMemberId(orderNo, member.getId(), parentId);
+ MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOneByOrderNoAndMemberIdAndRtMemberId(orderNo, parentId, member.getId());
if(ObjectUtil.isNotEmpty(mallMoneyFlow)){
mallMoneyFlow.setStatus(2);
mallMoneyFlow.setIsReturn(1);
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 896337e..a69fda8 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -118,6 +118,7 @@
<select id="selectCommissionIncome" resultType="java.math.BigDecimal">
select ifnull(sum(amount),0) from mall_money_flow
where flow_type =1 and type in (2) and rt_member_id=#{memberId}
+ and status = 2
<if test="type == 1">
and date_format(created_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
</if>
--
Gitblit v1.9.1