From 5cb35f00b996b09c749c909d54df45bf526645bc Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 29 Mar 2023 20:14:33 +0800
Subject: [PATCH] 根据补贴记录，减少用户贡献值
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 58 +++++++++++++++++++
src/main/java/cc/mrbird/febs/mall/mapper/MallMemberWalletMapper.java | 2
src/main/resources/mapper/modules/MallMemberWalletMapper.xml | 8 ++
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 12 ++-
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 4 +
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 46 +++++++++++++++
src/main/java/cc/mrbird/febs/mall/mapper/MallMoneyFlowMapper.java | 8 ++
src/main/java/cc/mrbird/febs/mall/service/IAgentService.java | 7 ++
8 files changed, 141 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberWalletMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberWalletMapper.java
index 2565786..f9f04b1 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberWalletMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberWalletMapper.java
@@ -39,4 +39,6 @@
void addBalanceById(@Param("balance")BigDecimal sharePerkAmount, @Param("id")Long id);
void addStarByMemberId(@Param("star")Integer starSum, @Param("memberId")Long memberId);
+
+ void reduceStarByMemberId(@Param("star")int i, @Param("memberId")Long memberId);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallMoneyFlowMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallMoneyFlowMapper.java
index 980ae49..a1ea6f4 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallMoneyFlowMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallMoneyFlowMapper.java
@@ -41,4 +41,12 @@
List<AdminTeamEqualsPerkVo> selectTeamEqualsMemberByDate(@Param("date") Date date);
IPage<AdminMallMoneyFlowVo> selectOrderMoneyFlowInPage(Page<AdminMallMoneyFlowVo> page, @Param("record")MallOrderInfo mallOrderInfo);
+
+ List<MallMoneyFlow> selectMoneyFlowByMemberIdAndIsRetrun(@Param("memberId") Long memberId, @Param("isReturn") int isReturn);
+
+ void updateRemarkById(@Param("remark")String remarkNum, @Param("id")Long id);
+
+ void updateRemarkAndIsReturnById(@Param("remark")String remarkNum, @Param("id")Long id);
+
+ MallMoneyFlow selectByOrderNoAndMemberId(@Param("orderNo")String orderNo, @Param("memberId")Long memberId, @Param("isReturn")int isReturn);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IAgentService.java b/src/main/java/cc/mrbird/febs/mall/service/IAgentService.java
index 3eee0c9..aadf0cc 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IAgentService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IAgentService.java
@@ -24,4 +24,11 @@
* @param memberId
*/
void flowTotalScoreBalance(List<MallMemberWallet> mallMemberWallets, BigDecimal amount, int flowType, String orderNo, Long memberId);
+
+ /**
+ * 减少用户贡献值
+ * @param memberId 用户ID
+ * @param totalScore 补贴额度
+ */
+ void reduceStar(Long memberId,BigDecimal totalScore);
}
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 ff9da3d..c627522 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
@@ -216,6 +216,8 @@
//减少补贴额度
mallMemberWalletMapper.reduceTotalScoreById(sharePerkAmount, mallMemberWallet.getId());
+ reduceStar(mallMemberUp.getId(),sharePerkAmount);
+
mallMemberWalletMapper.addBalanceById(sharePerkAmount, mallMemberWallet.getId());
mallMoneyFlowService.addMoneyFlow(
@@ -403,6 +405,8 @@
mallMoneyFlow.setRemark("补贴额度："+mallMemberWallet.getTotalScore());
mallMoneyFlow.setFlowType(FlowTypeEnum.BALANCE.getValue());
mallMoneyFlows.add(mallMoneyFlow);
+
+ reduceStar(mallMemberWallet.getMemberId(),starPerkAmount);
}
count = count + 1;
if (count % 1000 == 0 || count == mallMemberWallets.size()) {
@@ -480,6 +484,9 @@
mallMoneyFlow.setRemark("补贴额度："+mallMemberWallet.getTotalScore());
mallMoneyFlow.setFlowType(FlowTypeEnum.BALANCE.getValue());
mallMoneyFlows.add(mallMoneyFlow);
+
+ reduceStar(mallMemberWallet.getMemberId(),amount);
+
}
count = count + 1;
if (count % 1000 == 0 || count == mallMemberWallets.size()) {
@@ -516,5 +523,56 @@
}
}
+ @Override
+ public void reduceStar(Long memberId,BigDecimal totalScore) {
+ /**
+ *获取用户的全部未用完的补贴额度流水
+ */
+ MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
+ List<MallMoneyFlow> mallMoneyFlows = mallMoneyFlowMapper.selectMoneyFlowByMemberIdAndIsRetrun(memberId,2);
+ //如果补贴额度全部用完则更新用户的贡献点为零
+ if(CollUtil.isEmpty(mallMoneyFlows)){
+ mallMemberWalletMapper.reduceStarByMemberId(mallMemberWallet.getStar(), memberId);
+ return;
+ }
+ for(MallMoneyFlow mallMoneyFlow : mallMoneyFlows){
+ String remark = mallMoneyFlow.getRemark();
+ BigDecimal remarkNum = new BigDecimal(remark);
+ //如果补贴额度小于记录的剩余补贴额度
+ if(totalScore.compareTo(remarkNum) < 0){
+ remarkNum = remarkNum.subtract(totalScore).setScale(2,BigDecimal.ROUND_DOWN);
+ mallMoneyFlowMapper.updateRemarkById(remarkNum.toString(),mallMoneyFlow.getId());
+ break;
+ }
+ //如果补贴额度等于等于记录的剩余补贴额度
+ if(totalScore.compareTo(remarkNum) == 0){
+ remarkNum = remarkNum.subtract(totalScore).setScale(2,BigDecimal.ROUND_DOWN);
+ mallMoneyFlowMapper.updateRemarkAndIsReturnById(remarkNum.toString(),mallMoneyFlow.getId());
+
+ //减少用户的贡献点
+ String orderNo = mallMoneyFlow.getOrderNo();
+ MallMoneyFlow mallMoneyFlowStar = mallMoneyFlowMapper.selectByOrderNoAndMemberId(orderNo,memberId,2);
+ BigDecimal amount = mallMoneyFlowStar.getAmount();
+ mallMemberWalletMapper.reduceStarByMemberId(amount.intValue(), memberId);
+ //更新记录的返利状态为已返利
+ mallMoneyFlowMapper.updateRemarkAndIsReturnById("0",mallMoneyFlowStar.getId());
+ break;
+ }
+ //如果补贴额度大于记录的剩余补贴额度
+ if(totalScore.compareTo(remarkNum) > 0){
+ mallMoneyFlowMapper.updateRemarkAndIsReturnById("0",mallMoneyFlow.getId());
+
+ //减少用户的贡献点
+ String orderNo = mallMoneyFlow.getOrderNo();
+ MallMoneyFlow mallMoneyFlowStar = mallMoneyFlowMapper.selectByOrderNoAndMemberId(orderNo,memberId,2);
+ BigDecimal amount = mallMoneyFlowStar.getAmount();
+ mallMemberWalletMapper.reduceStarByMemberId(amount.intValue(), memberId);
+ //更新记录的返利状态为已返利
+ mallMoneyFlowMapper.updateRemarkAndIsReturnById("0",mallMoneyFlowStar.getId());
+ totalScore = totalScore.subtract(remarkNum);
+ }
+ }
+ }
+
}
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 f246af6..0659ef7 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
@@ -496,7 +496,8 @@
starSum,
MoneyFlowTypeEnum.STAR.getValue(),
orderInfo.getOrderNo(),
- FlowTypeEnum.STAR.getValue());
+ FlowTypeEnum.STAR.getValue(),
+ 2);
}
if(starGet.compareTo(star) > 0){
BigDecimal subtract = starGet.subtract(star);
@@ -509,7 +510,8 @@
starSum,
MoneyFlowTypeEnum.STAR.getValue(),
orderInfo.getOrderNo(),
- FlowTypeEnum.STAR.getValue());
+ FlowTypeEnum.STAR.getValue(),
+ 2);
}
}else{
mallMemberWalletMapper.addStarByMemberId(starSum.intValue(), memberId);
@@ -518,7 +520,8 @@
starSum,
MoneyFlowTypeEnum.STAR.getValue(),
orderInfo.getOrderNo(),
- FlowTypeEnum.STAR.getValue());
+ FlowTypeEnum.STAR.getValue(),
+ 2);
}
}
}
@@ -543,7 +546,8 @@
scoreSum,
MoneyFlowTypeEnum.TOTAL_SCORE.getValue(),
orderInfo.getOrderNo(),
- FlowTypeEnum.TOTAL_SCORE.getValue());
+ FlowTypeEnum.TOTAL_SCORE.getValue(),
+ 2);
}
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
index 810a8b8..b71bb06 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
@@ -688,6 +688,8 @@
//减少补贴额度
mallMemberWalletMapper.reduceTotalScoreById(offLinePerkAmountSum, mallMemberWallet.getId());
+ iAgentService.reduceStar(mallMemberWallet.getMemberId(),offLinePerkAmountSum);
+
mallMemberWalletMapper.addBalanceById(offLinePerkAmountSum, mallMemberWallet.getId());
mallMoneyFlowService.addMoneyFlow(
@@ -735,6 +737,8 @@
//减少补贴额度
mallMemberWalletMapper.reduceTotalScoreById(teamEqualsPerkAmount, mallMemberWallet.getId());
+ iAgentService.reduceStar(mallMemberWallet.getMemberId(),teamEqualsPerkAmount);
+
mallMemberWalletMapper.addBalanceById(teamEqualsPerkAmount, mallMemberWallet.getId());
//
// mallMoneyFlowService.addMoneyFlow(
diff --git a/src/main/resources/mapper/modules/MallMemberWalletMapper.xml b/src/main/resources/mapper/modules/MallMemberWalletMapper.xml
index 36a38eb..ac0aa70 100644
--- a/src/main/resources/mapper/modules/MallMemberWalletMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberWalletMapper.xml
@@ -119,5 +119,13 @@
WHERE member_id = #{memberId}
</update>
+ <update id="reduceStarByMemberId">
+ update mall_member_wallet
+ <set>
+ star = star - #{star},
+ </set>
+ WHERE member_id = #{memberId}
+ </update>
+
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index a453577..6f89a70 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -195,4 +195,50 @@
where a.order_no = #{record.orderNo}
order by a.CREATED_TIME desc
</select>
+
+ <select id="selectMoneyFlowByMemberIdAndIsRetrun" resultType="cc.mrbird.febs.mall.entity.MallMoneyFlow">
+ SELECT
+ *
+ FROM
+ mall_money_flow a
+ WHERE
+ a.type = 26
+ AND a.flow_type = 6
+ AND a.is_return = #{isReturn}
+ AND a.member_id = #{memberId}
+ ORDER BY
+ a.created_time ASC
+ </select>
+
+ <update id="updateRemarkById">
+ update mall_money_flow
+ <set>
+ remark = #{remark}
+ </set>
+ WHERE id = #{id}
+ </update>
+
+ <update id="updateRemarkAndIsReturnById">
+ update mall_money_flow
+ <set>
+ remark = #{remark},
+ is_return = 1
+ </set>
+ WHERE id = #{id}
+ </update>
+
+ <select id="selectByOrderNoAndMemberId" resultType="cc.mrbird.febs.mall.entity.MallMoneyFlow">
+ SELECT
+ *
+ FROM
+ mall_money_flow a
+ WHERE
+ a.type = 25
+ AND a.flow_type = 5
+ AND a.is_return = #{isReturn}
+ AND a.member_id = #{memberId}
+ AND a.order_no = #{orderNo}
+ ORDER BY
+ a.created_time ASC
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1