From 19bb8923067177c1e6b5d21320b61b4e30201230 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 11 May 2023 18:04:11 +0800
Subject: [PATCH] 支付设置
---
src/main/java/cc/mrbird/febs/mall/entity/MallMember.java | 3 +++
src/main/resources/mapper/modules/MallMemberMapper.xml | 8 +++++++-
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 1 +
3 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
index e177ca0..779c29a 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
@@ -156,6 +156,9 @@
*/
@TableField(exist = false)
private BigDecimal voucherCnt;
+
+ @TableField(exist = false)
+ private BigDecimal voucherCntSurplus;
/**
* 凭证现金
*/
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 0ea4c79..d8f5692 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -15,7 +15,13 @@
IFNULL(c.voucher_cnt,0) voucherCnt,
IFNULL(c.voucher_amount,0) voucherAmount,
IFNULL(c.voucher_fire_cnt,0) voucherFireCnt,
- d.description levelName
+ (SELECT
+ sum(IFNULL(surplus_cnt, 0))
+ FROM
+ mall_score_record
+ WHERE
+ member_id = m.id) voucherCntSurplus,
+ d.description levelName
FROM mall_member m
left join mall_member a on m.referrer_id = a.invite_id
LEFT JOIN mall_member_wallet c on c.member_id = m.id
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
index 400ff21..c55ce9d 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -303,6 +303,7 @@
{field: 'star', title: '贡献点', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.star) }}'},
{field: 'totalScore', title: '补贴额度', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.totalScore) }}'},
{field: 'voucherCnt', title: '绿色凭证', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.voucherCnt) }}'},
+ {field: 'voucherCntSurplus', title: '待释放数量', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.voucherCntSurplus) }}'},
{field: 'voucherAmount', title: '凭证现金', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.voucherAmount) }}'},
{field: 'voucherFireCnt', title: '能量值', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.voucherFireCnt) }}'},
{field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
--
Gitblit v1.9.1