From c9d95d5a0fc355e82c674323b0d792bbecca9e54 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 16 Jun 2022 11:49:35 +0800
Subject: [PATCH] fix
---
src/main/resources/templates/febs/views/modules/system/profitSetting.html | 2 +-
src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeEnum.java | 6 +++---
src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html | 8 ++++----
src/main/java/cc/mrbird/febs/mall/entity/MallMoneyFlow.java | 2 +-
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 2 +-
src/main/java/cc/mrbird/febs/mall/dto/MoneyFlowDto.java | 2 +-
src/main/java/cc/mrbird/febs/mall/vo/MoneyFlowVo.java | 2 +-
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 2 +-
src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html | 4 ++--
9 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeEnum.java b/src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeEnum.java
index 789244b..ab749bf 100644
--- a/src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeEnum.java
+++ b/src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeEnum.java
@@ -4,7 +4,7 @@
/**
*
- * 1-静态收益 2-动态收益 3-代理收益 4-排名收益 5-董事收益 6-社区点补 7-推荐人收益 8-提现 9-转增 10-支付 11-退款
+ * 1-静态收益 2-直推奖 3-代理收益 4-排名收益 5-董事收益 6-社区点补 7-一代收益 8-提现 9-转增 10-支付 11-退款
* @author wzy
* @date 2021-09-24
**/
@@ -15,7 +15,7 @@
*/
STATIC_BONUS(1),
/**
- * 动态收益
+ * 直推奖
*/
DYNAMIC_ACHIEVE(2),
@@ -40,7 +40,7 @@
COMMUNITY_BONUS(6),
/**
- * 推荐人收益
+ * 一代收益
*/
RECOMMEND_BONUS(7),
/**
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/MoneyFlowDto.java b/src/main/java/cc/mrbird/febs/mall/dto/MoneyFlowDto.java
index 78291f9..fd26c51 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/MoneyFlowDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/MoneyFlowDto.java
@@ -19,7 +19,7 @@
@ApiModelProperty(value = "页码", example = "1")
private Integer pageNum;
- @ApiModelProperty(value = "类型 1-静态收益 2-动态收益 3-代理收益 4-排名收益 5-董事收益 6-社区点补 7-推荐人收益 8-提现 9-转增 10-支付 11-退款")
+ @ApiModelProperty(value = "类型 1-静态收益 2-直推奖 3-代理收益 4-排名收益 5-董事收益 6-社区点补 7-一代收益 8-提现 9-转增 10-支付 11-退款")
private Integer type;
@ApiModelProperty(value = "类型 1-全部 2-支出 3-收入")
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallMoneyFlow.java b/src/main/java/cc/mrbird/febs/mall/entity/MallMoneyFlow.java
index dd13190..44112ac 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallMoneyFlow.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMoneyFlow.java
@@ -19,7 +19,7 @@
private BigDecimal amount;
/**
- * 类型 1-静态收益 2-动态收益 3-代理收益 4-排名收益 5-董事收益 6-社区点补 7-推荐人收益 8-提现 9-转增
+ * 类型 1-静态收益 2-直推奖 3-代理收益 4-排名收益 5-董事收益 6-社区点补 7-一代收益 8-提现 9-转增
*/
private Integer type;
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 afd3b1f..1538394 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
@@ -312,7 +312,7 @@
}
/**
- * 拿推荐人收益（代理，直推，排名）的10%加权平分给下面直推
+ * 拿推荐人的收益（代理，直推，排名）的10%加权平分给下面直推
*/
@Override
public void thankfulProfit() {
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MoneyFlowVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MoneyFlowVo.java
index e32a561..079aa36 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MoneyFlowVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MoneyFlowVo.java
@@ -22,7 +22,7 @@
@ApiModelProperty(value = "金额，有正负")
private BigDecimal amount;
- @ApiModelProperty(value = "类型 1-静态收益 2-动态收益 3-代理收益 4-排名收益 5-董事收益 6-社区点补 7-推荐人收益 8-提现 9-转增 10-支付 11-退款")
+ @ApiModelProperty(value = "类型 1-静态收益 2-直推奖 3-代理收益 4-排名收益 5-董事收益 6-社区点补 7-一代收益 8-提现 9-转增 10-支付 11-退款")
private Integer type;
@ApiModelProperty(value = "对方手机号")
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index ebef8b7..2efb9bc 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -110,7 +110,7 @@
<select id="selectCommissionIncome" resultType="java.math.BigDecimal">
select ifnull(sum(amount),0) from mall_money_flow
- where flow_type=4 and amount > 0 and member_id=#{memberId}
+ where flow_type =4 and type in (1,2,3,4,5,6,7,15,16) and member_id=#{memberId}
<if test="type == 1">
and date_format(created_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
</if>
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html
index 0a9664f..2250265 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html
@@ -49,7 +49,7 @@
if (d.type === 1) {
return '<span>静态收益</span>'
} else if (d.type === 2) {
- return '<span>动态收益</span>'
+ return '<span>直推奖</span>'
} else if (d.type === 3) {
return '<span>代理收益</span>'
} else if (d.type === 4) {
@@ -59,7 +59,7 @@
}else if (d.type === 6) {
return '<span>社区店补</span>'
}else if (d.type === 7) {
- return '<span>推荐人收益</span>'
+ return '<span>一代收益</span>'
}else if (d.type === 8) {
return '<span>提现</span>'
}else if (d.type === 9) {
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
index f18c7ab..c812f68 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
@@ -23,12 +23,12 @@
<select name="type">
<option value="">请选择</option>
<option value="1">静态收益</option>
- <option value="2">动态收益</option>
+ <option value="2">直推奖</option>
<option value="3">代理收益</option>
<option value="4">排名收益</option>
<option value="5">董事收益</option>
<option value="6">社区店补</option>
- <option value="7">推荐人收益</option>
+ <option value="7">一代收益</option>
<option value="8">提现</option>
<option value="9">转账</option>
<option value="10">支付</option>
@@ -125,7 +125,7 @@
if (d.type === 1) {
return '<span>静态收益</span>'
} else if (d.type === 2) {
- return '<span>动态收益</span>'
+ return '<span>直推奖</span>'
} else if (d.type === 3) {
return '<span>代理收益</span>'
} else if (d.type === 4) {
@@ -135,7 +135,7 @@
}else if (d.type === 6) {
return '<span>社区店补</span>'
}else if (d.type === 7) {
- return '<span>推荐人收益</span>'
+ return '<span>一代收益</span>'
}else if (d.type === 8) {
return '<span>提现</span>'
}else if (d.type === 9) {
diff --git a/src/main/resources/templates/febs/views/modules/system/profitSetting.html b/src/main/resources/templates/febs/views/modules/system/profitSetting.html
index f6b28f1..1053413 100644
--- a/src/main/resources/templates/febs/views/modules/system/profitSetting.html
+++ b/src/main/resources/templates/febs/views/modules/system/profitSetting.html
@@ -69,7 +69,7 @@
{{# }}}
{{# if(item.code == 'THANKFUL_BONUS') { }}
- <div class="layui-word-aux" style="margin-left: 150px;">将推荐人收益(代理，直推，排名)的对应比例加权平分给下面直推</div>
+ <div class="layui-word-aux" style="margin-left: 150px;">将推荐人的收益(代理，直推，排名)的对应比例加权平分给下面直推</div>
{{# }}}
</div>
{{# }) }}
--
Gitblit v1.9.1