From d275747a472b31e15f8f5de8916d583b836c1dce Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 23 Jul 2020 11:09:39 +0800
Subject: [PATCH] 20200723 代码提交
---
src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java | 33 ++++++++
src/main/java/com/xcong/excoin/modules/trademanage/controller/TradeManageController.java | 9 ++
src/main/java/com/xcong/excoin/modules/trademanage/service/TradeManageService.java | 3
src/main/resources/templates/febs/views/modules/trademanage/agentReturnInfosAloneTest.html | 119 +++++++++++++++++++++++++++++
src/main/java/com/xcong/excoin/modules/member/mapper/MemberAccountMoneyChangeMapper.java | 3
src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml | 28 +++++++
src/main/resources/templates/febs/views/modules/trademanage/agentReturnInfosAlone.html | 2
src/main/java/com/xcong/excoin/modules/trademanage/controller/ViewController.java | 11 ++
8 files changed, 206 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/mapper/MemberAccountMoneyChangeMapper.java b/src/main/java/com/xcong/excoin/modules/member/mapper/MemberAccountMoneyChangeMapper.java
index 6b86880..ffbdb11 100644
--- a/src/main/java/com/xcong/excoin/modules/member/mapper/MemberAccountMoneyChangeMapper.java
+++ b/src/main/java/com/xcong/excoin/modules/member/mapper/MemberAccountMoneyChangeMapper.java
@@ -17,4 +17,7 @@
String selectAccountMoneyChangeByMemberId(Long memberId);
+ IPage<MemberAccountMoneyChangeEntity> findMemberAgentReturnInfoAloneTestInPage(
+ Page<MemberAccountMoneyChangeEntity> page, @Param("record")MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity);
+
}
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/controller/TradeManageController.java b/src/main/java/com/xcong/excoin/modules/trademanage/controller/TradeManageController.java
index d253769..3b5dc1f 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/controller/TradeManageController.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/controller/TradeManageController.java
@@ -89,6 +89,15 @@
}
/**
+ * 返佣明细---Test
+ */
+ @GetMapping("memberAgentReturnInfoAloneTest")
+ public FebsResponse memberAgentReturnInfoAloneTest(MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity, QueryRequest request) {
+ Map<String, Object> data = getDataTable(tradeManageService.findMemberAgentReturnInfoAloneTestInPage(memberAccountMoneyChangeEntity, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
* 返佣总明细---列表
*/
@GetMapping("memberAgentReturnInfos")
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/controller/ViewController.java b/src/main/java/com/xcong/excoin/modules/trademanage/controller/ViewController.java
index 1e1c567..ef2ef78 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/controller/ViewController.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/controller/ViewController.java
@@ -102,7 +102,7 @@
}
/**
- * 历史委托明细--- Test
+ * 历史委托明细---Test
* @return
*/
@GetMapping("historyOrderAloneTest")
@@ -130,5 +130,14 @@
public String agentReturnInfosAlone() {
return FebsUtil.view("modules/trademanage/agentReturnInfosAlone");
}
+ /**
+ * 返佣总明细--Test
+ * @return
+ */
+ @GetMapping("agentReturnInfosAloneTest")
+ @RequiresPermissions("agentReturnInfosAloneTest:view")
+ public String agentReturnInfosAloneTest() {
+ return FebsUtil.view("modules/trademanage/agentReturnInfosAloneTest");
+ }
}
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/service/TradeManageService.java b/src/main/java/com/xcong/excoin/modules/trademanage/service/TradeManageService.java
index aaa4266..158574f 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/service/TradeManageService.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/service/TradeManageService.java
@@ -42,4 +42,7 @@
IPage<ContractOrderEntity> findhistoryOrderInfoAloneTestInfoInPage(ContractOrderEntity contractOrderEntity, QueryRequest request);
+ IPage<MemberAccountMoneyChangeEntity> findMemberAgentReturnInfoAloneTestInPage(MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity,
+ QueryRequest request);
+
}
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java b/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java
index 3420f88..de7fd2d 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java
@@ -386,6 +386,39 @@
}
return findMemberAccountInfoListInPage;
}
+
+ @Override
+ public IPage<MemberAccountMoneyChangeEntity> findMemberAgentReturnInfoAloneTestInPage(
+ MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity, QueryRequest request) {
+ Page<MemberAccountMoneyChangeEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<MemberAccountMoneyChangeEntity> findMemberAccountInfoListInPage =
+ memberAccountMoneyChangeMapper.findMemberAgentReturnInfoAloneTestInPage(page, memberAccountMoneyChangeEntity);
+
+ List<MemberAccountMoneyChangeEntity> records = findMemberAccountInfoListInPage.getRecords();
+ if(records != null && records.size() > 0) {
+ String selectYJByMemberId = agentReturnMapper.selectYJByMemberId();
+ for(MemberAccountMoneyChangeEntity accountMoneyChangeEntity : records) {
+ Long memberId = accountMoneyChangeEntity.getMemberId();
+ String allAmount = memberAccountMoneyChangeMapper.selectAccountMoneyChangeByMemberId(memberId);
+ Map<String, Object> columnMap = new HashMap<>();
+ columnMap.put("member_id", memberId);
+ List<MemberAuthenticationEntity> selectByMap = memberAuthenticationMapper.selectByMap(columnMap );
+ if(selectByMap != null && selectByMap.size() > 0) {
+ MemberAuthenticationEntity memberAuthenticationEntity = selectByMap.get(0);
+ String firstName = memberAuthenticationEntity.getFirstName();
+ String secondName = memberAuthenticationEntity.getSecondName();
+ String realName = firstName + secondName;
+ accountMoneyChangeEntity.setRealName(realName);
+ }
+ accountMoneyChangeEntity.setAllAmount(allAmount);
+ if(memberId == 8) {
+ accountMoneyChangeEntity.setAmount(BigDecimal.ZERO);
+ accountMoneyChangeEntity.setAllAmount(selectYJByMemberId);
+ }
+ }
+ }
+ return findMemberAccountInfoListInPage;
+ }
diff --git a/src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml b/src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml
index a4d97aa..3e1a114 100644
--- a/src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml
+++ b/src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml
@@ -56,6 +56,34 @@
ORDER BY s.create_time DESC
</select>
+ <select id="findMemberAgentReturnInfoAloneTestInPage" resultType="com.xcong.excoin.modules.member.entity.MemberAccountMoneyChangeEntity">
+ SELECT
+ m.phone,
+ m.email,
+ m.invite_id inviteId,
+ s.member_id,
+ s.symbol,
+ s.amount,
+ s.content,
+ s.create_time createTime,
+ s. STATUS,
+ s.type
+ FROM
+ member_account_money_change s
+ LEFT JOIN member m ON m.id = s.member_id
+ <where>
+ s.type = 3
+ and (s.member_id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) or m.id = 10)
+ and s.content like '%佣金到账%'
+ <if test="record != null" >
+ <if test="record.account!=null and record.account!=''">
+ and (m.phone = #{record.account} or m.email = #{record.account} or m.invite_id=#{record.account})
+ </if>
+ </if>
+ </where>
+ ORDER BY s.create_time DESC
+ </select>
+
<select id="selectAccountMoneyChangeByMemberId" resultType="java.lang.String">
select IFNULL(SUM(s.amount), '0') AS allAmount from member_account_money_change s where s.content like '%佣金到账%' and s.member_id = #{memberId}
</select>
diff --git a/src/main/resources/templates/febs/views/modules/trademanage/agentReturnInfosAlone.html b/src/main/resources/templates/febs/views/modules/trademanage/agentReturnInfosAlone.html
index dc313dc..6ac7e1a 100644
--- a/src/main/resources/templates/febs/views/modules/trademanage/agentReturnInfosAlone.html
+++ b/src/main/resources/templates/febs/views/modules/trademanage/agentReturnInfosAlone.html
@@ -1,4 +1,4 @@
-<div class="layui-fluid layui-anim febs-anim" id="febs-user" lay-title="返佣明细03">
+<div class="layui-fluid layui-anim febs-anim" id="febs-user" lay-title="返佣明细">
<div class="layui-row febs-container">
<div class="layui-col-md12">
<div class="layui-card">
diff --git a/src/main/resources/templates/febs/views/modules/trademanage/agentReturnInfosAloneTest.html b/src/main/resources/templates/febs/views/modules/trademanage/agentReturnInfosAloneTest.html
new file mode 100644
index 0000000..50dc8d5
--- /dev/null
+++ b/src/main/resources/templates/febs/views/modules/trademanage/agentReturnInfosAloneTest.html
@@ -0,0 +1,119 @@
+<div class="layui-fluid layui-anim febs-anim" id="febs-user" lay-title="返佣明细03">
+ <div class="layui-row febs-container">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <div class="layui-card-body febs-table-full">
+ <form class="layui-form layui-table-form" lay-filter="user-table-form">
+ <div class="layui-row">
+ <div class="layui-col-md10">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input type="text" placeholder="手机号/邮箱/邀请码" name="account" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
+ <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="query">
+ <i class="layui-icon"></i>
+ </div>
+ <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">
+ <i class="layui-icon"></i>
+ </div>
+ </div>
+ </div>
+ </form>
+ <table lay-filter="userTable" lay-data="{id: 'userTable'}"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<!-- 表格操作栏 end -->
+<script data-th-inline="none" type="text/javascript">
+ // 引入组件并初始化
+ layui.use([ 'jquery', 'laydate', 'form', 'table', 'febs'], function () {
+ var $ = layui.jquery,
+ laydate = layui.laydate,
+ febs = layui.febs,
+ form = layui.form,
+ table = layui.table,
+ $view = $('#febs-user'),
+ $query = $view.find('#query'),
+ $reset = $view.find('#reset'),
+ $searchForm = $view.find('form'),
+ sortObject = {field: 'createTime', type: null},
+ tableIns;
+
+ form.render();
+
+ // 表格初始化
+ initTable();
+
+ // 查询按钮
+ $query.on('click', function () {
+ var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
+ tableIns.reload({where: params, page: {curr: 1}});
+ });
+
+ // 刷新按钮
+ $reset.on('click', function () {
+ $searchForm[0].reset();
+ sortObject.type = 'null';
+ tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
+ });
+
+ function initTable() {
+ tableIns = febs.table.init({
+ elem: $view.find('table'),
+ id: 'userTable',
+ url: ctx + 'tradeManage/memberAgentReturnInfoAloneTest',
+ totalRow: true,
+ cols: [[
+ {field: 'phone', title: '手机号', minWidth: 100,align:'left',totalRowText: '合计'},
+ {field: 'email', title: '邮箱', minWidth: 200,align:'left'},
+ {field: 'realName', title: '姓名', minWidth: 200,align:'left'},
+ {field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},
+ {field: 'symbol', title: '币种', minWidth: 80,align:'center'},
+ {field: 'amount', title: '当天返佣', minWidth: 80,align:'center',totalRow: true},
+ {field: 'allAmount', title: '总返佣', minWidth: 80,align:'center',totalRow: true},
+ {field: 'content', title: '记录内容', minWidth: 80,align:'center'},
+ {field: 'createTime', title: '时间', minWidth: 80,align:'center'},
+ {field: 'status', title: '状态',
+ templet: function (d) {
+ if (d.status === 0) {
+ return '<span style="color:blue;">待审核</span>'
+ } else if (d.status === 1) {
+ return '<span style="color:green;">成功</span>'
+ }else if (d.status === 2) {
+ return '<span style="color:red;">失败</span>'
+ }else{
+ return ''
+ }
+ }, minWidth: 80,align:'center'},
+ {field: 'type', title: '类型',
+ templet: function (d) {
+ if (d.type === 1) {
+ return '<span>币币资产</span>'
+ } else if (d.type === 2) {
+ return '<span>合约资产</span>'
+ }else if (d.type === 3) {
+ return '<span>代理资产</span>'
+ }else{
+ return ''
+ }
+ }, minWidth: 80,align:'center'}
+ ]]
+ });
+ }
+
+ // 获取查询参数
+ function getQueryParams() {
+ return {
+ account: $searchForm.find('input[name="account"]').val().trim(),
+ };
+ }
+
+ })
+</script>
\ No newline at end of file
--
Gitblit v1.9.1