From c070371c7af738dbcfcf045b9fcc2c7342972323 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 23 Dec 2022 11:52:12 +0800
Subject: [PATCH] 20221221
---
src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java | 3 ++-
src/main/resources/mapper/modules/MallMemberMapper.xml | 10 ++++------
src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html | 2 +-
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 2 +-
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 3 ---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 2 +-
6 files changed, 9 insertions(+), 13 deletions(-)
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 ccdc516..f67ca51 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
@@ -335,7 +335,7 @@
MyTeamVo myTeamVo = new MyTeamVo();
myTeamVo.setTeam(list);
- myTeamVo.setMyAchieve(this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 1));
+ myTeamVo.setMyAchieve(mallOrderInfoMapper.selectTotalAmount(memberId));
myTeamVo.setMyTeamAchieve(this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 2));
myTeamVo.setMyTeamCnt(this.baseMapper.selectAllChildAgentListByInviteId(mallMember.getInviteId()).size());
return new FebsResponse().success().data(myTeamVo);
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java
index 0053096..561c66c 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java
@@ -79,13 +79,14 @@
withdraw.setAmount(withdrawalDto.getAmount());
withdraw.setStatus(1);
withdraw.setAmountFee(serviceFee);
+ withdraw.setRemark(withdrawalDto.getBankNo());
// withdraw.setWtihdrawTypeId(mallMemberBank.getId());
this.baseMapper.insert(withdraw);
//生成提现流水记录
Long subsidyAmountFlowId = mallMoneyFlowService.addMoneyFlow(
memberId,
orderNo,
- withdrawalDto.getAmount(),
+ withdrawalDto.getAmount().negate(),
MallMoneyFlowTypeEnum.WITHDRAW.getCode(),
MallMoneyFlow.STATUS_ING,
MallMoneyFlow.IS_RETURN_Y,
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index be651c6..b249646 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -79,20 +79,17 @@
a.invite_id,
2 isCurrent,
a.created_time,
- p.prize_score,
- u.description levelName,
(select sum(e.amount)
from mall_order_info e
inner join mall_member b on e.member_id=b.ID
inner join mall_order_item c on e.id = c.order_id -- and c.is_normal=2
- where e.status in (2, 3, 4) and e.order_type=1 and (b.invite_id=a.invite_id or b.referrer_id=a.invite_id)) amount,
+ where e.status <![CDATA[>= ]]> 4 and (b.invite_id=a.invite_id or b.referrer_id=a.invite_id)) amount,
(select count(1) from mall_member e
- inner join mall_order_info b on e.id=b.member_id and b.status in (2, 3, 4)
+ inner join mall_order_info b on e.id=b.member_id and b.status <![CDATA[>= ]]> 4
where find_in_set(a.invite_id, e.referrer_ids)) orderCnt,
(select count(1) from mall_member x where find_in_set(a.invite_id, x.referrer_ids)) cnt
from mall_member a
inner join mall_member_wallet p on a.id=p.member_id
- left join data_dictionary_custom u on a.level=u.code and u.type='AGENT_LEVEL'
where a.referrer_id=#{inviteId}
</select>
@@ -356,9 +353,10 @@
<select id="selectAchieveByMemberId" resultType="java.math.BigDecimal">
select IFNULL(sum(IFNULL(a.amount, 0)), 0)
- from mall_achieve_record a
+ from mall_order_info a
inner join mall_member b on a.member_id=b.ID
where 1=1
+ and a.status <![CDATA[>= ]]> 4
<if test="type == 1">
and b.invite_id=#{inviteId}
</if>
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index fbb78fa..9d2fc4d 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -76,12 +76,9 @@
a.remark remark,
a.status status,
b.name,
- b.bind_phone bindPhone,
- c.bank_no bankNo,
b.phone
from mall_member_withdraw a
inner join mall_member b on a.member_id=b.id
- inner join mall_member_bank c on c.member_id=b.id
<where>
<if test="record != null" >
<if test="record.name!=null and record.name!=''">
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 806a69b..9778498 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -243,7 +243,7 @@
<select id="selectTotalAmount" resultType="java.math.BigDecimal">
select IFNULL(sum(IFNULL(amount,0)),0) from mall_order_info
- where member_id=#{memberId} and status in (2, 3, 4) and order_type=1
+ where member_id=#{memberId} and status <![CDATA[>= ]]> 4
</select>
<select id="selectTotalAmountForDate" resultType="java.math.BigDecimal">
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html b/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
index d166530..e1a74bd 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
@@ -124,7 +124,7 @@
{field: 'phone', title: '账号', minWidth: 150,align:'left'},
{field: 'amount', title: '金额', minWidth: 150,align:'left'},
{field: 'amountFee', title: '手续费', minWidth: 150,align:'left'},
- {field: 'bankNo', title: '地址', minWidth: 300,align:'left'},
+ {field: 'remark', title: '地址', minWidth: 300,align:'left'},
{field: 'status', title: '状态',
templet: function (d) {
if (d.status === 1) {
--
Gitblit v1.9.1