From 75478fa7a2dbf6bdcab7f96c1348475150a67b70 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 11 May 2023 15:49:01 +0800
Subject: [PATCH] 支付设置
---
src/main/java/cc/mrbird/febs/mall/vo/ApiScoreVoucherInfoVo.java | 3 +++
src/main/java/cc/mrbird/febs/mall/mapper/MallScoreRecordMapper.java | 2 ++
src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java | 4 ++++
src/main/resources/mapper/modules/MallScoreRecordMapper.xml | 7 +++++++
4 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallScoreRecordMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallScoreRecordMapper.java
index 18c4ba8..7d0bb8b 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallScoreRecordMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallScoreRecordMapper.java
@@ -20,4 +20,6 @@
IPage<MallScoreRecord> gerRoleReleaseListInPage(Page<MallScoreRecord> page, @Param("record")AdminRoleReleaseDto roleReleaseDto);
IPage<MallMoneyFlow> gerRoleReleaseChildInPage(Page<MallMoneyFlow> page, @Param("record")MallScoreRecord mallScoreRecord);
+
+ BigDecimal selectSurplusCntByMemberId(@Param("memberId")Long id);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java
index 6c90350..86b2f8a 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java
@@ -58,6 +58,7 @@
private final MallMemberBankMapper mallMemberBankMapper;
private final MallMemberWithdrawMapper mallMemberWithdrawMapper;
private final IApiMallMemberService mallMemberService;
+ private final MallScoreRecordMapper mallScoreRecordMapper;
@Override
public ScoreSignVo scoreSign() {
@@ -117,6 +118,9 @@
GreenScoreEnum.SCORE_POOL_CNT.getType(),
GreenScoreEnum.SCORE_POOL_CNT.getCode());
apiScoreVoucherInfoVo.setScorePoolCnt(new BigDecimal(scorePoolCntDic.getValue()).setScale(2,BigDecimal.ROUND_DOWN));
+
+ BigDecimal voucherCntSurplus = mallScoreRecordMapper.selectSurplusCntByMemberId(member.getId());
+ apiScoreVoucherInfoVo.setVoucherCntSurplus(voucherCntSurplus);
return apiScoreVoucherInfoVo;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/ApiScoreVoucherInfoVo.java b/src/main/java/cc/mrbird/febs/mall/vo/ApiScoreVoucherInfoVo.java
index b963d24..b753894 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/ApiScoreVoucherInfoVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/ApiScoreVoucherInfoVo.java
@@ -13,6 +13,9 @@
@ApiModelProperty(value = "绿色积分")
private BigDecimal voucherCnt;
+
+ @ApiModelProperty(value = "绿色积分-待释放")
+ private BigDecimal voucherCntSurplus;
/**
* 数量
*/
diff --git a/src/main/resources/mapper/modules/MallScoreRecordMapper.xml b/src/main/resources/mapper/modules/MallScoreRecordMapper.xml
index df062e9..0c1a034 100644
--- a/src/main/resources/mapper/modules/MallScoreRecordMapper.xml
+++ b/src/main/resources/mapper/modules/MallScoreRecordMapper.xml
@@ -41,4 +41,11 @@
order by a.created_time desc
</select>
+ <select id="selectSurplusCntByMemberId" resultType="java.math.BigDecimal">
+ select
+ IFNULL(sum(IFNULL(surplus_cnt,0)),0)
+ from mall_score_record
+ where member_id = #{memberId}
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1