From b2ed8c0adb0791f7bef4fc68afcde994db44adf2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 09 Jan 2023 15:55:25 +0800
Subject: [PATCH] 20221227 充值归集
---
src/test/java/cc/mrbird/febs/ProfitTest.java | 6 +++---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 3 +--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
index c46244e..9beb2e6 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -368,8 +368,7 @@
registerDto.setPassword("a123456");
registerDto.setInviteId(member.getInviteId());
registerDto.setName(member.getName());
- apiMallMemberService.register(registerDto);
- return new FebsResponse().success();
+ return apiMallMemberService.register(registerDto);
}
/**
diff --git a/src/test/java/cc/mrbird/febs/ProfitTest.java b/src/test/java/cc/mrbird/febs/ProfitTest.java
index 3bf561e..05c3c10 100644
--- a/src/test/java/cc/mrbird/febs/ProfitTest.java
+++ b/src/test/java/cc/mrbird/febs/ProfitTest.java
@@ -128,7 +128,7 @@
Long subsidyAmountFlowId = mallMoneyFlowService.addMoneyFlow(
mallMember.getId(),
orderInfo.getOrderNo(),
- subsidyAmount.setScale(2, BigDecimal.ROUND_DOWN),
+ subsidyAmount.setScale(4, BigDecimal.ROUND_DOWN),
MallMoneyFlowTypeEnum.MARKET_SUBSIDIES.getCode(),
MallMoneyFlow.STATUS_SUCCESS,
MallMoneyFlow.IS_RETURN_Y,
@@ -160,7 +160,7 @@
DataDictionaryEnum.REWARD_PERCENT.getCode()
);
BigDecimal rewardPercent = new BigDecimal(rewardPercentDic.getValue()).multiply(new BigDecimal(0.01)).setScale(2,BigDecimal.ROUND_DOWN);
- BigDecimal directRewardAmount = subsidyAmount.multiply(rewardPercent).setScale(2, BigDecimal.ROUND_DOWN);
+ BigDecimal directRewardAmount = subsidyAmount.multiply(rewardPercent).setScale(4, BigDecimal.ROUND_DOWN);
Long marketSubsidyFlowId = mallMoneyFlowService.addMoneyFlow(
mallMember.getId(),
@@ -180,7 +180,7 @@
);
//生成分享奖励的流水记录
BigDecimal shareOne = new BigDecimal(shareOneDic.getValue()).multiply(new BigDecimal(0.01)).setScale(2,BigDecimal.ROUND_DOWN);
- BigDecimal shareOneAmount = subsidyAmount.multiply(shareOne).setScale(2, BigDecimal.ROUND_DOWN);
+ BigDecimal shareOneAmount = subsidyAmount.multiply(shareOne).setScale(4, BigDecimal.ROUND_DOWN);
Long ShareOneFlowId = mallMoneyFlowService.addMoneyFlow(
mallMember.getId(),
orderInfo.getOrderNo(),
--
Gitblit v1.9.1