From d96780e6122bace05b9f17eaabf202061f06979f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 11 Aug 2023 17:23:57 +0800
Subject: [PATCH] 数据修改
---
src/main/resources/templates/febs/views/dapp/member.html | 7 +
src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java | 2
src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java | 14 +++
src/main/resources/mapper/dapp/DappMemberDao.xml | 2
src/main/java/cc/mrbird/febs/dapp/vo/MemberMoneyFlowVo.java | 21 +++++
src/main/resources/templates/febs/views/goods/orderMoneyFlow.html | 66 ++++++++++++----
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 5 +
src/main/resources/templates/febs/views/dapp/memberMoneyFlow.html | 94 +++++++++++++++++++++++
src/main/java/cc/mrbird/febs/dapp/controller/MemberController.java | 14 +++
9 files changed, 207 insertions(+), 18 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/MemberController.java b/src/main/java/cc/mrbird/febs/dapp/controller/MemberController.java
index 6d59ec5..d9623b5 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/MemberController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/MemberController.java
@@ -12,6 +12,7 @@
import cc.mrbird.febs.dapp.entity.DappMemberEntity;
import cc.mrbird.febs.dapp.entity.DappSystemProfit;
import cc.mrbird.febs.dapp.entity.DappTransferRecordEntity;
+import cc.mrbird.febs.dapp.entity.MallOrderInfo;
import cc.mrbird.febs.dapp.service.DappMemberService;
import cc.mrbird.febs.dapp.vo.AdminAgentLevelOptionTreeVo;
import cc.mrbird.febs.dapp.vo.AdminSystemFeeVo;
@@ -187,4 +188,17 @@
return dappMemberService.updateSystemPay(mallSystemPayDto);
}
+ /**
+ * 订单列表-资金流水
+ */
+ @GetMapping("/orderMoneyFlow")
+ public FebsResponse orderMoneyFlow(QueryRequest request, DappMemberEntity dappMemberEntity, Integer parentId) {
+ if (parentId == null) {
+ ViewController.idMemberMoneyFlow = 0;
+ }
+ dappMemberEntity.setId(ViewController.idMemberMoneyFlow);
+ Map<String, Object> dataTable = getDataTable(dappMemberService.memberMoneyFlow(request, dappMemberEntity));
+ return new FebsResponse().success().data(dataTable);
+ }
+
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java
index cdc3ec8..7e8f6a6 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java
@@ -253,4 +253,18 @@
model.addAttribute("type", type);
return FebsUtil.view("dapp/mallSystemPay");
}
+
+ /**
+ * 个人-资金流水
+ * @param id
+ * @param model
+ * @return
+ */
+ public static long idMemberMoneyFlow;
+ @GetMapping("memberFlow/{id}")
+ @RequiresPermissions("agentLevel:view")
+ public String memberFlow(@PathVariable long id, Model model) {
+ idMemberMoneyFlow = id;
+ return FebsUtil.view("dapp/memberMoneyFlow");
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java b/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
index f30e377..bd0dcce 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
@@ -84,4 +84,6 @@
FebsResponse salePackage(SalePackageDto salePackageDto);
FebsResponse updateSystemPay(MallSystemPayDto mallSystemPayDto);
+
+ IPage<MemberMoneyFlowVo> memberMoneyFlow(QueryRequest request, DappMemberEntity dappMemberEntity);
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index 3efaebe..9ccf8d8 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -877,6 +877,11 @@
return new FebsResponse().success();
}
+ @Override
+ public IPage<MemberMoneyFlowVo> memberMoneyFlow(QueryRequest request, DappMemberEntity dappMemberEntity) {
+ return null;
+ }
+
public static List<List<String>> partitionList(List<String> originalList, int partitionSize) {
List<List<String>> partitionedList = new ArrayList<>();
int size = originalList.size();
diff --git a/src/main/java/cc/mrbird/febs/dapp/vo/MemberMoneyFlowVo.java b/src/main/java/cc/mrbird/febs/dapp/vo/MemberMoneyFlowVo.java
new file mode 100644
index 0000000..5d78f0a
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/vo/MemberMoneyFlowVo.java
@@ -0,0 +1,21 @@
+package cc.mrbird.febs.dapp.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel(value = "MemberMoneyFlowVo", description = "个人流水")
+public class MemberMoneyFlowVo {
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+ //原有积分
+ private BigDecimal preAmount;
+ //预期
+ private BigDecimal amount;
+ //实际
+ private BigDecimal afterAmount;
+}
diff --git a/src/main/resources/mapper/dapp/DappMemberDao.xml b/src/main/resources/mapper/dapp/DappMemberDao.xml
index 2bd78b9..d2518a4 100644
--- a/src/main/resources/mapper/dapp/DappMemberDao.xml
+++ b/src/main/resources/mapper/dapp/DappMemberDao.xml
@@ -296,7 +296,7 @@
<select id="selectMallOrderItemVoByOrderId" resultType="cc.mrbird.febs.dapp.vo.MallOrderItemVo">
select a.*
from mall_order_item a
- where orderId = #{orderId}
+ where order_id = #{orderId}
</select>
<select id="selectMallGoodsListVoById" resultType="cc.mrbird.febs.dapp.vo.MallGoodsListVo">
diff --git a/src/main/resources/templates/febs/views/dapp/member.html b/src/main/resources/templates/febs/views/dapp/member.html
index b940034..daec1f3 100644
--- a/src/main/resources/templates/febs/views/dapp/member.html
+++ b/src/main/resources/templates/febs/views/dapp/member.html
@@ -75,6 +75,7 @@
<script type="text/html" id="mallmember-option">
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="agentLevel:view" lay-event="agentLevel">设置会员级别</button>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="agentLevel:view" lay-event="memberFlow">个人流水</button>
</script>
<script data-th-inline="none" type="text/javascript">
layui.use(['dropdown', 'jquery', 'laydate', 'form', 'table', 'febs', 'treeSelect'], function () {
@@ -109,6 +110,12 @@
}
});
}
+
+ if (layEvent === 'memberFlow') {
+ febs.modal.open( '订单流水', 'dappView/memberFlow/' + data.id, {
+ maxmin: true,
+ });
+ }
});
table.on('sort(memberTable)', function (obj) {
diff --git a/src/main/resources/templates/febs/views/dapp/memberMoneyFlow.html b/src/main/resources/templates/febs/views/dapp/memberMoneyFlow.html
new file mode 100644
index 0000000..9fb9860
--- /dev/null
+++ b/src/main/resources/templates/febs/views/dapp/memberMoneyFlow.html
@@ -0,0 +1,94 @@
+<div class="layui-fluid layui-anim febs-anim" id="febs-memberMoneyFlow-child" lay-title="资金流水">
+ <div class="layui-row febs-container">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <div class="layui-card-body febs-table-full">
+ <table lay-filter="memberMoneyFlowChild" lay-data="{id: 'memberMoneyFlowChild'}"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script type="text/html" id="flow-type">
+ {{#
+ var type = {
+ 1: {title: '赠送积分', color: 'orange'},
+ 2: {title: '支付订单', color: 'green'},
+ 3: {title: '静态补贴', color: 'blue'},
+ 4: {title: '预期减少赠送积分', color: 'orange'},
+ 5: {title: '预期增加余额', color: 'green'},
+ 6: {title: '直推', color: 'blue'},
+ 7: {title: '团队静态收益V1', color: 'orange'},
+ 8: {title: '团队静态收益V2', color: 'green'},
+ 9: {title: '团队静态收益V3', color: 'blue'},
+ 10: {title: '团队静态收益V4', color: 'orange'},
+ 11: {title: '团队静态收益V5', color: 'green'},
+ 12: {title: '团队静态收益V6', color: 'blue'},
+ 13: {title: '团队静态收益V7', color: 'orange'},
+ 14: {title: '共享加速V1', color: 'green'},
+ 15: {title: '共享加速V2', color: 'blue'},
+ 16: {title: '共享加速V3', color: 'orange'},
+ 17: {title: '共享加速V4', color: 'green'},
+ 18: {title: '共享加速V5', color: 'blue'},
+ 19: {title: '共享加速V6', color: 'orange'},
+ 20: {title: '共享加速V7', color: 'green'},
+ 21: {title: '实际减少赠送积分', color: 'blue'},
+ 22: {title: '实际增加余额', color: 'orange'},
+ 23: {title: '卖出资产', color: 'green'},
+ 24: {title: '卖出资产获得余额', color: 'blue'},
+ 25: {title: '卖出资产手续费', color: 'orange'},
+ 26: {title: '每日获取金额(前端提示记录)', color: 'orange'},
+ 27: {title: '系统拨付余额', color: 'green'},
+ 28: {title: '系统拨付赠送积分', color: 'blue'},
+ 29: {title: '系统拨付资产包', color: 'orange'},
+ 30: {title: '新增业绩', color: 'green'},
+ 31: {title: '全网分红V1', color: 'green'},
+ 32: {title: '全网分红V2', color: 'green'},
+ 33: {title: '全网分红V3', color: 'green'},
+ 34: {title: '全网分红V4', color: 'green'},
+ 35: {title: '全网分红V5', color: 'green'},
+ 36: {title: '全网分红V6', color: 'green'},
+ 37: {title: '全网分红V7', color: 'green'},
+ }[d.type];
+ }}
+ <span class="layui-badge febs-bg-{{type.color}}">{{ type.title }}</span>
+</script>
+<script data-th-inline="none" type="text/javascript">
+
+ layui.use([ 'jquery', 'form', 'table', 'febs', 'upload','laydate'], function () {
+ var $ = layui.jquery,
+ febs = layui.febs,
+ form = layui.form,
+ table = layui.table,
+ upload = layui.upload,
+ $view = $('#febs-memberMoneyFlow-child'),
+ laydate = layui.laydate,
+ tableIns;
+
+ form.render();
+
+ initTable();
+
+ laydate.render({
+ elem: '#user-createTime',
+ range: true,
+ trigger: 'click'
+ });
+
+
+ function initTable() {
+ tableIns = febs.table.init({
+ elem: $view.find('table'),
+ id: 'memberMoneyFlowChild',
+ url: ctx + 'admin/goods/orderMoneyFlow?parentId=1',
+ cols: [[
+ {field: 'address', title: '用户', minWidth: 80,align:'center'},
+ {field: 'amount', title: '金额', minWidth: 80,align:'center'},
+ {title: '类型', minWidth: 100,templet: '#flow-type',align:'center'},
+ {field: 'createTime', title: '时间', minWidth: 150,align:'left'}
+ ]]
+ });
+ }
+
+ })
+</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/goods/orderMoneyFlow.html b/src/main/resources/templates/febs/views/goods/orderMoneyFlow.html
index eac4c70..fc0ea04 100644
--- a/src/main/resources/templates/febs/views/goods/orderMoneyFlow.html
+++ b/src/main/resources/templates/febs/views/goods/orderMoneyFlow.html
@@ -12,26 +12,58 @@
<script type="text/html" id="flow-type">
{{#
var type = {
- 1: {title: '支付', color: 'orange'},
- 2: {title: '直推', color: 'green'},
- 3: {title: '赠送积分', color: 'blue'},
- 4: {title: '市场拓展奖', color: 'orange'},
- 5: {title: '团队静态收益', color: 'green'},
- 6: {title: '个人静态收益', color: 'blue'},
- 7: {title: '积分奖励', color: 'orange'},
+ 1: {title: '赠送积分', color: 'orange'},
+ 2: {title: '支付订单', color: 'green'},
+ 3: {title: '静态补贴', color: 'blue'},
+ 4: {title: '预期减少赠送积分', color: 'orange'},
+ 5: {title: '预期增加余额', color: 'green'},
+ 6: {title: '直推', color: 'blue'},
+ 7: {title: '团队静态收益V1', color: 'orange'},
+ 8: {title: '团队静态收益V2', color: 'green'},
+ 9: {title: '团队静态收益V3', color: 'blue'},
+ 10: {title: '团队静态收益V4', color: 'orange'},
+ 11: {title: '团队静态收益V5', color: 'green'},
+ 12: {title: '团队静态收益V6', color: 'blue'},
+ 13: {title: '团队静态收益V7', color: 'orange'},
+ 14: {title: '共享加速V1', color: 'green'},
+ 15: {title: '共享加速V2', color: 'blue'},
+ 16: {title: '共享加速V3', color: 'orange'},
+ 17: {title: '共享加速V4', color: 'green'},
+ 18: {title: '共享加速V5', color: 'blue'},
+ 19: {title: '共享加速V6', color: 'orange'},
+ 20: {title: '共享加速V7', color: 'green'},
+ 21: {title: '实际减少赠送积分', color: 'blue'},
+ 22: {title: '实际增加余额', color: 'orange'},
+ 23: {title: '卖出资产', color: 'green'},
+ 24: {title: '卖出资产获得余额', color: 'blue'},
+ 25: {title: '卖出资产手续费', color: 'orange'},
+ 26: {title: '每日获取金额(前端提示记录)', color: 'orange'},
+ 27: {title: '系统拨付余额', color: 'green'},
+ 28: {title: '系统拨付赠送积分', color: 'blue'},
+ 29: {title: '系统拨付资产包', color: 'orange'},
+ 30: {title: '新增业绩', color: 'green'},
+ 31: {title: '全网分红V1', color: 'green'},
+ 32: {title: '全网分红V2', color: 'green'},
+ 33: {title: '全网分红V3', color: 'green'},
+ 34: {title: '全网分红V4', color: 'green'},
+ 35: {title: '全网分红V5', color: 'green'},
+ 36: {title: '全网分红V6', color: 'green'},
+ 37: {title: '全网分红V7', color: 'green'},
}[d.type];
}}
<span class="layui-badge febs-bg-{{type.color}}">{{ type.title }}</span>
</script>
<script data-th-inline="none" type="text/javascript">
- layui.use([ 'jquery', 'laydate', 'form', 'table', 'febs', 'treeSelect' ,'eleTree'], function () {
- var $ = layui.jquery,
- laydate = layui.laydate,
- febs = layui.febs,
- form = layui.form,
- table = layui.table
- $view = $('#febs-orderMoneyFlow-child')
- tableIns;
+
+ layui.use([ 'jquery', 'form', 'table', 'febs', 'upload','laydate'], function () {
+ var $ = layui.jquery,
+ febs = layui.febs,
+ form = layui.form,
+ table = layui.table,
+ upload = layui.upload,
+ $view = $('#febs-orderMoneyFlow-child'),
+ laydate = layui.laydate,
+ tableIns;
form.render();
@@ -48,12 +80,12 @@
tableIns = febs.table.init({
elem: $view.find('table'),
id: 'orderMoneyFlowChild',
- url: ctx + 'admin/goods/orderMoneyFlow',
+ url: ctx + 'admin/goods/orderMoneyFlow?parentId=1',
cols: [[
{field: 'address', title: '用户', minWidth: 80,align:'center'},
{field: 'amount', title: '金额', minWidth: 80,align:'center'},
{title: '类型', minWidth: 100,templet: '#flow-type',align:'center'},
- {field: 'createdTime', title: '时间', minWidth: 150,align:'left'}
+ {field: 'createTime', title: '时间', minWidth: 150,align:'left'}
]]
});
}
--
Gitblit v1.9.1