From 15559a2b23c8a6b53f0f7cd23406494a53b6b722 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 19 May 2025 10:43:19 +0800
Subject: [PATCH] feat(mall): 优化会员资金流水页面并添加新功能
---
src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html | 53 +++++++++++++++++++++++++++++------------------------
src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java | 5 +++--
2 files changed, 32 insertions(+), 26 deletions(-)
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 f2f6832..abc52bf 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
@@ -7,6 +7,7 @@
import cc.mrbird.febs.common.enumerates.ScoreFlowTypeEnum;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.LoginUserUtil;
+import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.mall.dto.ScoreSettingDto;
import cc.mrbird.febs.mall.dto.signActivity.ApiSignDataDto;
import cc.mrbird.febs.mall.dto.signActivity.ApiSignListDto;
@@ -295,7 +296,7 @@
member.getId(),
amount,
ScoreFlowTypeEnum.SIGN_EXPERIENCE.getValue(),
- mallScoreSignRecord.getId().toString(),
+ MallUtils.getOrderNum(),
FlowTypeEnum.SCORE.getValue(),
StrUtil.format(ScoreFlowTypeEnum.SIGN_EXPERIENCE.getDesc(),amount),
2);
@@ -306,7 +307,7 @@
member.getId(),
amount,
ScoreFlowTypeEnum.SIGN_SCORE.getValue(),
- mallScoreSignRecord.getId().toString(),
+ MallUtils.getOrderNum(),
FlowTypeEnum.PRIZE_SCORE.getValue(),
StrUtil.format(ScoreFlowTypeEnum.SIGN_SCORE.getDesc(),amount),
2);
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
index b7cd3f0..2f65a82 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
@@ -8,13 +8,13 @@
<div class="layui-col-md10">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">用户昵称</label>
+ <label class="layui-form-label">用户昵称：</label>
<div class="layui-input-inline">
<input type="text" placeholder="用户昵称" name="name" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">手机号码</label>
+ <label class="layui-form-label">手机号码：</label>
<div class="layui-input-inline">
<input type="text" placeholder="手机号码" name="phone" autocomplete="off" class="layui-input">
</div>
@@ -49,19 +49,19 @@
<!-- </select>-->
<!-- </div>-->
<!-- </div>-->
-<!-- <div class="layui-inline">-->
-<!-- <label class="layui-form-label layui-form-label-sm">资金类型</label>-->
-<!-- <div class="layui-input-inline">-->
-<!-- <select name="flowType">-->
-<!-- <option value="">请选择</option>-->
-<!-- <option value="1">余额</option>-->
-<!-- <option value="3">积分</option>-->
-<!-- </select>-->
-<!-- </div>-->
-<!-- </div>-->
+ <div class="layui-inline">
+ <label class="layui-form-label">资金类型：</label>
+ <div class="layui-input-inline">
+ <select name="flowType">
+ <option value="">请选择</option>
+ <option value="1">余额</option>
+ <option value="3">积分</option>
+ </select>
+ </div>
+ </div>
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">开始时间</label>
+ <label class="layui-form-label">开始时间：</label>
<div class="layui-input-inline">
<input type="text" name="startTime" id="febs-money-flow-start" lay-verify="date"
placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
@@ -69,7 +69,7 @@
</div>
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">结束时间</label>
+ <label class="layui-form-label">结束时间：</label>
<div class="layui-input-inline">
<input type="text" name="endTime" id="febs-money-flow-end" lay-verify="date"
placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
@@ -149,6 +149,7 @@
url: ctx + 'admin/mallMember/getMoneyFlowList',
totalRow : true,
cols: [[
+ {type: 'numbers', title: '', width: 80},
{field: 'name', title: '用户昵称', minWidth: 100,align:'left',totalRowText:"合计"},
{field: 'phone', title: '手机号码', minWidth: 150,align:'left'},
{field: 'amount', title: '金额', minWidth: 150,align:'left', totalRow:true},
@@ -214,16 +215,20 @@
// }
// }
// }, minWidth: 80,align:'center'},
- // {field: 'flowType', title: '资金类型',
- // templet: function (d) {
- // if (d.flowType === 1) {
- // return '余额';
- // } else if(d.flowType === 3) {
- // return '积分'
- // } else {
- // return '-';
- // }
- // }, minWidth: 80,align:'center'},
+ {field: 'flowType', title: '资金类型',
+ templet: function (d) {
+ if (d.flowType === 1) {
+ return '余额';
+ } else if(d.flowType === 2) {
+ return '会员经验'
+ } else if(d.flowType === 3) {
+ return '积分'
+ } else if(d.flowType === 4) {
+ return '佣金'
+ } else {
+ return '-';
+ }
+ }, minWidth: 80,align:'center'},
{field: 'remark', title: '内容', minWidth: 200,align:'left'},
{field: 'orderNo', title: '编号', minWidth: 150,align:'left'},
{field: 'createdTime', title: '创建时间', minWidth: 180,align:'center'}
--
Gitblit v1.9.1