From efdb36e7b369e90305ba6c592a7a6df478cfd7a8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 24 Sep 2021 19:04:43 +0800
Subject: [PATCH] fix some problem
---
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java | 1 +
src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java | 2 +-
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 3 ++-
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 5 +++++
4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
index e1a238d..775c46a 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
@@ -78,6 +78,6 @@
})
@PostMapping(value = "/moneyFlow")
public FebsResponse moneyFlow(@RequestBody MoneyFlowDto moneyFlowDto) {
- return null;
+ return memberService.moneyFlows(moneyFlowDto);
}
}
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 9a61d7f..979c1f7 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
@@ -208,6 +208,11 @@
MallMemberVo mallMemberVo = MallMemberConversion.INSTANCE.entityToVo(mallMember);
+ MallMember referMember = this.baseMapper.selectInfoByInviteId(mallMember.getReferrerId());
+ if (referMember != null) {
+ mallMemberVo.setReferrerName(referMember.getName());
+ }
+
MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(mallMemberVo.getId());
mallMemberVo.setBalance(wallet.getBalance());
return new FebsResponse().success().data(mallMemberVo);
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
index b7b5764..6751a9d 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
@@ -39,6 +39,7 @@
@ApiModelProperty(value = "代理等级")
private String levelName;
+ @ApiModelProperty(value = "推荐人昵称")
private String referrerName;
private String level;
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index f5e1eb1..e01b963 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -12,7 +12,7 @@
a.*,
b.phone
from mall_money_flow a
- inner join mall_member on a.rt_member_id=b.member_id
+ inner join mall_member b on a.member_id=b.id
<where>
<if test="record.type == 2">
and a.amount > 0
@@ -24,5 +24,6 @@
and a.member_id=#{record.memberId}
</if>
</where>
+ order by a.created_time desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1