From 18989f63f6d71c9bfae0ad3128eb59b3723d889c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 03 Nov 2022 12:25:13 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/dapp/controller/AdminOnHookPlanController.java | 18 ++++++
src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderDao.java | 3 +
src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml | 10 +++
src/main/java/cc/mrbird/febs/dapp/controller/ViewOnHookPlanController.java | 22 +++++++
src/main/java/cc/mrbird/febs/dapp/service/AdminOnHookPlanService.java | 2
src/main/resources/templates/febs/views/onhookplan/amountFlow.html | 40 +++++++++++++
src/main/resources/templates/febs/views/onhookplan/planList.html | 23 ++++---
src/main/java/cc/mrbird/febs/dapp/service/impl/AdminOnHookPlanServiceImpl.java | 8 ++
src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java | 2
9 files changed, 118 insertions(+), 10 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/AdminOnHookPlanController.java b/src/main/java/cc/mrbird/febs/dapp/controller/AdminOnHookPlanController.java
index f1746a5..4821081 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/AdminOnHookPlanController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/AdminOnHookPlanController.java
@@ -52,6 +52,24 @@
}
/**
+ * 挂机-列表-流水详情
+ * @return
+ */
+ @GetMapping("getFlowList")
+ public FebsResponse getFlowList(IgtOnHookPlanOrder igtOnHookPlanOrder, QueryRequest request, Integer parentId) {
+ if (parentId == null) {
+ ViewOnHookPlanController.idOrderFlow = 0;
+ }
+ User currentUser = FebsUtil.getCurrentUser();
+ User currentUserDetail = userService.findByName(currentUser.getUsername());
+ if(ObjectUtil.isNotEmpty(currentUserDetail.getDescription())){
+ igtOnHookPlanOrder.setDescription(currentUser.getDescription());
+ }
+ Map<String, Object> data = getDataTable(adminOnHookPlanService.getFlowList(ViewOnHookPlanController.idOrderFlow, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
* IGT挂机时间规则 -- 更新
*/
@PostMapping(value = "/setPlan")
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ViewOnHookPlanController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ViewOnHookPlanController.java
index 68efc1b..b2714ae 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ViewOnHookPlanController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ViewOnHookPlanController.java
@@ -3,8 +3,11 @@
import cc.mrbird.febs.common.entity.FebsConstant;
import cc.mrbird.febs.common.utils.FebsUtil;
import cc.mrbird.febs.dapp.entity.DataDictionaryCustom;
+import cc.mrbird.febs.dapp.entity.IgtOnHookPlanOrder;
+import cc.mrbird.febs.dapp.entity.MallNewsInfo;
import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum;
import cc.mrbird.febs.dapp.mapper.DataDictionaryCustomMapper;
+import cc.mrbird.febs.dapp.mapper.IgtOnHookPlanOrderDao;
import cc.mrbird.febs.dapp.service.AdminOnHookPlanService;
import cc.mrbird.febs.dapp.vo.AdminPlanSetVo;
import cc.mrbird.febs.dapp.vo.AdminTransferInsideSetVo;
@@ -14,6 +17,7 @@
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@Controller("onHookView")
@@ -22,7 +26,10 @@
public class ViewOnHookPlanController {
private final AdminOnHookPlanService adminOnHookPlanService;
+ private final IgtOnHookPlanOrderDao igtOnHookPlanOrderDao;
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+
+ public static long idOrderFlow;
/**
* 挂机-列表
@@ -58,5 +65,20 @@
return FebsUtil.view("onhookplan/planSet");
}
+ /**
+ * 资金流水详情
+ * @param id
+ * @param model
+ * @return
+ */
+ @GetMapping("/amountFlow/{id}")
+ @RequiresPermissions("amountFlow:update")
+ public String amountFlow(@PathVariable long id, Model model) {
+ idOrderFlow = id;
+ IgtOnHookPlanOrder data = igtOnHookPlanOrderDao.selectById(id);
+ model.addAttribute("igtOrder", data);
+ return FebsUtil.view("onhookplan/amountFlow");
+ }
+
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderDao.java b/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderDao.java
index 34eb5bd..57c6f20 100644
--- a/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderDao.java
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderDao.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.dapp.mapper;
+import cc.mrbird.febs.dapp.entity.DappAccountMoneyChangeEntity;
import cc.mrbird.febs.dapp.entity.IgtOnHookPlanOrder;
import cc.mrbird.febs.dapp.vo.AdminIgtOnHookPlanOrderVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -31,4 +32,6 @@
List<Long> selectIdsByState(@Param("state")int i);
void updateByIds(List<Long> ids);
+
+ IPage<DappAccountMoneyChangeEntity> findFlowListInPage(Page<DappAccountMoneyChangeEntity> page, @Param("orderId")Long id);
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/AdminOnHookPlanService.java b/src/main/java/cc/mrbird/febs/dapp/service/AdminOnHookPlanService.java
index eb84d39..f4f2e44 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/AdminOnHookPlanService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/AdminOnHookPlanService.java
@@ -1,6 +1,7 @@
package cc.mrbird.febs.dapp.service;
import cc.mrbird.febs.common.entity.QueryRequest;
+import cc.mrbird.febs.dapp.entity.DappAccountMoneyChangeEntity;
import cc.mrbird.febs.dapp.entity.IgtOnHookPlanOrder;
import cc.mrbird.febs.dapp.vo.AdminIgtOnHookPlanOrderVo;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -10,4 +11,5 @@
IPage<AdminIgtOnHookPlanOrderVo> getplanList(IgtOnHookPlanOrder igtOnHookPlanOrder, QueryRequest request);
+ IPage<DappAccountMoneyChangeEntity> getFlowList(Long id, QueryRequest request);
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/AdminOnHookPlanServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/AdminOnHookPlanServiceImpl.java
index 21c811c..a17fa5e 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/AdminOnHookPlanServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/AdminOnHookPlanServiceImpl.java
@@ -1,6 +1,7 @@
package cc.mrbird.febs.dapp.service.impl;
import cc.mrbird.febs.common.entity.QueryRequest;
+import cc.mrbird.febs.dapp.entity.DappAccountMoneyChangeEntity;
import cc.mrbird.febs.dapp.entity.IgtOnHookPlanOrder;
import cc.mrbird.febs.dapp.entity.MemberCoinWithdrawEntity;
import cc.mrbird.febs.dapp.mapper.IgtOnHookPlanOrderDao;
@@ -29,4 +30,11 @@
return adminIgtOnHookPlanOrderVoIPage;
}
+ @Override
+ public IPage<DappAccountMoneyChangeEntity> getFlowList(Long id, QueryRequest request) {
+ Page<DappAccountMoneyChangeEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<DappAccountMoneyChangeEntity> accountMoneyChangeEntityIPage = igtOnHookPlanOrderDao.findFlowListInPage(page, id);
+ return accountMoneyChangeEntityIPage;
+ }
+
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
index 417015d..003aaee 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
@@ -128,7 +128,7 @@
dappMemberDao.updateById(dappMember);
DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberId, availableAmount, balance.negate()
- , availableAmount.subtract(balance).setScale(2,BigDecimal.ROUND_DOWN), "挂机", 6);
+ , availableAmount.subtract(balance).setScale(2,BigDecimal.ROUND_DOWN), "挂机", 6,igtOnHookPlanOrder.getId());
dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
}
diff --git a/src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml b/src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml
index 57f1f82..2539ac7 100644
--- a/src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml
+++ b/src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml
@@ -98,4 +98,14 @@
</foreach>
</update>
+ <select id="findFlowListInPage" resultType="cc.mrbird.febs.dapp.entity.DappAccountMoneyChangeEntity">
+ SELECT
+ a.*
+ FROM
+ dapp_account_money_change a
+ left join dapp_member b on a.member_id = b.id
+ where a.order_id = #{orderId}
+ order by s.create_time asc
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/onhookplan/amountFlow.html b/src/main/resources/templates/febs/views/onhookplan/amountFlow.html
new file mode 100644
index 0000000..a292891
--- /dev/null
+++ b/src/main/resources/templates/febs/views/onhookplan/amountFlow.html
@@ -0,0 +1,40 @@
+<div className="layui-fluid layui-anim febs-anim" id="febs-refunding-child" lay-title="资金流水">
+ <div className="layui-row febs-container">
+ <div className="layui-col-md12">
+ <div className="layui-card">
+ <div className="layui-card-body febs-table-full">
+ <table lay-filter="refundingTableChild" lay-data="{id: 'refundingTableChild'}"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script data-th-inline="none" type="text/javascript">
+ layui.use(['jquery', 'form', 'table', 'febs'], function () {
+ var $ = layui.jquery,
+ febs = layui.febs,
+ form = layui.form,
+ table = layui.table,
+ $view = $('#febs-refunding-child'),
+ tableIns;
+
+ form.render();
+
+ initTable();
+
+ function initTable() {
+ tableIns = febs.table.init({
+ elem: $view.find('table'),
+ id: 'refundingTableChild',
+ url: ctx + 'admin/onHook/getFlowList?parentId=1',
+ cols: [[
+ {field: 'username', title: '用户名', minWidth: 150},
+ {field: 'amount', title: '变化金额', minWidth: 100},
+ {field: 'content', title: '描述', minWidth: 130},
+ {field: 'createTime', title: '创建时间', minWidth: 180}
+ ]]
+ });
+ }
+
+ })
+</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/onhookplan/planList.html b/src/main/resources/templates/febs/views/onhookplan/planList.html
index 4423c11..9e09c01 100644
--- a/src/main/resources/templates/febs/views/onhookplan/planList.html
+++ b/src/main/resources/templates/febs/views/onhookplan/planList.html
@@ -72,6 +72,12 @@
disagree(data.id);
});
}
+
+ if (layEvent === 'amountFlow') {
+ febs.modal.open( '资金流水详情', 'onHookView/amountFlow/' + data.id, {
+ maxmin: true,
+ });
+ }
});
function agree(id) {
@@ -120,15 +126,14 @@
{field: 'planCode', title: '挂机方案倍数', minWidth: 120, align: 'center'},
{field: 'profit', title: '总收益', minWidth: 120, align: 'center', totalRow: true},
{field: 'createTime', title: '时间', minWidth: 180, align: 'center'},
- // {title: '操作',
- // templet: function (d) {
- // if(d.status === 1){
- // return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agree" shiro:hasPermission="user:update">同意</button>'
- // +'<button class="layui-btn layui-btn-danger layui-btn-xs layui-btn-danger" lay-event="disagree" shiro:hasPermission="user:update">拒绝</button>'
- // }else{
- // return ''
- // }
- // },minWidth: 120,align:'center'}
+ {title: '操作',
+ templet: function (d) {
+ if(d.state === 2){
+ return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="amountFlow" shiro:hasPermission="user:update">流水记录</button>'
+ }else{
+ return ''
+ }
+ },minWidth: 120,align:'center'}
]]
});
}
--
Gitblit v1.9.1