From 417948ce1bc907440333ab523204f76d547a75c8 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Mon, 20 Mar 2023 15:25:53 +0800 Subject: [PATCH] 后台修改 --- src/main/java/cc/mrbird/febs/mall/entity/MallMember.java | 4 ++++ src/main/resources/mapper/modules/MallMemberMapper.xml | 15 +++++++++++---- src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 2 ++ 3 files changed, 17 insertions(+), 4 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 61a5590..f349c52 100644 --- a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java +++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java @@ -114,6 +114,10 @@ private BigDecimal prizeScore; @TableField(exist = false) private BigDecimal commission; + @TableField(exist = false) + private Integer star; + @TableField(exist = false) + private BigDecimal totalScore; @TableField(exist = false) private BigDecimal amount; diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml index 29afe0a..54b0785 100644 --- a/src/main/resources/mapper/modules/MallMemberMapper.xml +++ b/src/main/resources/mapper/modules/MallMemberMapper.xml @@ -3,8 +3,16 @@ <mapper namespace="cc.mrbird.febs.mall.mapper.MallMemberMapper"> <select id="selectMallMemberListInPage" resultType="cc.mrbird.febs.mall.entity.MallMember"> - SELECT m.*,a.name referrerName,IFNULL(c.balance,0) balance,IFNULL(c.score,0) score,IFNULL(c.prize_score,0) prizeScore,IFNULL(c.commission,0) commission - ,d.description levelName + SELECT + m.*, + a.name referrerName, + IFNULL(c.balance,0) balance, + IFNULL(c.score,0) score, + IFNULL(c.prize_score,0) prizeScore, + IFNULL(c.commission,0) commission, + IFNULL(c.star,0) star, + IFNULL(c.total_score,0) totalScore, + 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 @@ -143,8 +151,7 @@ sum(b.amount) FROM mall_member e - INNER JOIN mall_order_info b ON e.id = b.member_id - AND b. STATUS = 4 + INNER JOIN mall_achieve_record b ON e.id = b.member_id WHERE e.invite_id = m.invite_id OR e.referrer_id = m.invite_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 7e48841..e5ab3a7 100644 --- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html +++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html @@ -239,6 +239,8 @@ {field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'}, {field: 'balance', title: '余额', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.balance) }}'}, {field: 'prizeScore', title: '现金积分', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.prizeScore) }}'}, + {field: 'star', title: '贡献点', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.prizeScore) }}'}, + {field: 'totalScore', title: '补贴额度', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.prizeScore) }}'}, {field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'}, {field: 'levelName', title: '会员类型', minWidth: 100,align:'left'}, {field: 'storeMaster', title: '线下服务中心', templet:'#switchStoreMaster', minWidth: 120,align:'left'}, -- Gitblit v1.9.1