From a99275f05dcbd532ee5b8c5f9c5a80afea16e16a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 04 Mar 2022 11:07:54 +0800
Subject: [PATCH] 20211201  fish

---
 src/main/resources/templates/febs/views/modules/zhiya/zhiyaList.html            |  145 ++++++++++++++++++++++++
 src/main/java/com/xcong/excoin/modules/zhiya/controller/ZhiyaController.java    |   38 ++++++
 src/main/resources/mapper/modules/ZhiyaMapper.xml                               |   25 ++++
 src/main/java/com/xcong/excoin/modules/zhiya/mapper/ZhiyaMapper.java            |   13 ++
 src/main/java/com/xcong/excoin/modules/zhiya/entity/ZhiYaEntity.java            |   45 +++++++
 src/main/java/com/xcong/excoin/modules/zhiya/service/ZhiyaService.java          |   12 ++
 src/main/resources/application-dev.yml                                          |    9 +
 src/main/java/com/xcong/excoin/modules/zhiya/controller/ViewController.java     |   22 +++
 src/main/resources/application-test.yml                                         |    7 
 src/main/java/com/xcong/excoin/modules/zhiya/service/impl/ZhiyaServiceImpl.java |   30 +++++
 10 files changed, 341 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/zhiya/controller/ViewController.java b/src/main/java/com/xcong/excoin/modules/zhiya/controller/ViewController.java
new file mode 100644
index 0000000..129c47b
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/zhiya/controller/ViewController.java
@@ -0,0 +1,22 @@
+package com.xcong.excoin.modules.zhiya.controller;
+
+import com.xcong.excoin.common.entity.FebsConstant;
+import com.xcong.excoin.common.utils.FebsUtil;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller("zhiyaView")
+@RequestMapping(FebsConstant.VIEW_PREFIX + "modules/zhiya")
+public class ViewController {
+
+    /**
+     * 质押账户记录
+     */
+    @GetMapping("zhiyaList")
+    @RequiresPermissions("zhiyaList:view")
+    public String zhiyaList() {
+        return FebsUtil.view("modules/zhiya/zhiyaList");
+    }
+}
diff --git a/src/main/java/com/xcong/excoin/modules/zhiya/controller/ZhiyaController.java b/src/main/java/com/xcong/excoin/modules/zhiya/controller/ZhiyaController.java
new file mode 100644
index 0000000..6e66a88
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/zhiya/controller/ZhiyaController.java
@@ -0,0 +1,38 @@
+package com.xcong.excoin.modules.zhiya.controller;
+
+import com.xcong.excoin.common.controller.BaseController;
+import com.xcong.excoin.common.entity.FebsResponse;
+import com.xcong.excoin.common.entity.QueryRequest;
+import com.xcong.excoin.modules.zhiya.entity.ZhiYaEntity;
+import com.xcong.excoin.modules.zhiya.service.ZhiyaService;
+import lombok.RequiredArgsConstructor;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@Validated
+@RestController
+@RequiredArgsConstructor
+@RequestMapping(value = "/zhiya")
+public class ZhiyaController extends BaseController {
+
+    private final ZhiyaService zhiyaService;
+
+    /**
+     * 质押账户记录
+     * @param zhiYaEntity
+     * @param request
+     * @return
+     */
+    @GetMapping("/zhiyaList")
+    @RequiresPermissions("zhiyaList:view")
+    public FebsResponse getZhiyaListPage(ZhiYaEntity zhiYaEntity, QueryRequest request) {
+        Map<String, Object> data = getDataTable(zhiyaService.findZhiyaListInPage(zhiYaEntity, request));
+        return new FebsResponse().success().data(data);
+    }
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/zhiya/entity/ZhiYaEntity.java b/src/main/java/com/xcong/excoin/modules/zhiya/entity/ZhiYaEntity.java
new file mode 100644
index 0000000..375a891
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/zhiya/entity/ZhiYaEntity.java
@@ -0,0 +1,45 @@
+package com.xcong.excoin.modules.zhiya.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.xcong.excoin.common.entity.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@TableName("zhi_ya")
+public class ZhiYaEntity extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户Id
+     */
+    private Long memberId;
+
+    /**
+     * 可用余额
+     */
+    private BigDecimal availableBalance;
+
+    /**
+     * 总金额
+     */
+    private BigDecimal totalBalance;
+
+    /**
+     * 冻结金额
+     */
+    private BigDecimal frozenBalance;
+
+    @TableField(exist = false)
+    private String account;
+
+    @TableField(exist = false)
+    private String phone;
+
+    @TableField(exist = false)
+    private String inviteId;
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/zhiya/mapper/ZhiyaMapper.java b/src/main/java/com/xcong/excoin/modules/zhiya/mapper/ZhiyaMapper.java
new file mode 100644
index 0000000..cbe8f15
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/zhiya/mapper/ZhiyaMapper.java
@@ -0,0 +1,13 @@
+package com.xcong.excoin.modules.zhiya.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xcong.excoin.modules.zhiya.entity.ZhiYaEntity;
+import org.apache.ibatis.annotations.Param;
+
+public interface ZhiyaMapper extends BaseMapper<ZhiYaEntity> {
+
+    IPage<ZhiYaEntity> selectZhiyaListInPage(Page<ZhiYaEntity> page, @Param("record")ZhiYaEntity zhiYaEntity);
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/zhiya/service/ZhiyaService.java b/src/main/java/com/xcong/excoin/modules/zhiya/service/ZhiyaService.java
new file mode 100644
index 0000000..c5fbc40
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/zhiya/service/ZhiyaService.java
@@ -0,0 +1,12 @@
+package com.xcong.excoin.modules.zhiya.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.xcong.excoin.common.entity.QueryRequest;
+import com.xcong.excoin.modules.zhiya.entity.ZhiYaEntity;
+
+public interface ZhiyaService extends IService<ZhiYaEntity> {
+
+    IPage<ZhiYaEntity> findZhiyaListInPage(ZhiYaEntity zhiYaEntity, QueryRequest request);
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/zhiya/service/impl/ZhiyaServiceImpl.java b/src/main/java/com/xcong/excoin/modules/zhiya/service/impl/ZhiyaServiceImpl.java
new file mode 100644
index 0000000..a8aff8a
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/zhiya/service/impl/ZhiyaServiceImpl.java
@@ -0,0 +1,30 @@
+package com.xcong.excoin.modules.zhiya.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xcong.excoin.common.entity.QueryRequest;
+import com.xcong.excoin.modules.trademanage.entity.ContractHoldOrderEntity;
+import com.xcong.excoin.modules.trademanage.entity.OrderCoinsDealEntity;
+import com.xcong.excoin.modules.trademanage.mapper.ContractHoldOrderEntityMapper;
+import com.xcong.excoin.modules.trademanage.mapper.OrderCoinDealMapper;
+import com.xcong.excoin.modules.trademanage.service.TradeManageService;
+import com.xcong.excoin.modules.zhiya.entity.ZhiYaEntity;
+import com.xcong.excoin.modules.zhiya.mapper.ZhiyaMapper;
+import com.xcong.excoin.modules.zhiya.service.ZhiyaService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class ZhiyaServiceImpl extends ServiceImpl<ZhiyaMapper, ZhiYaEntity> implements ZhiyaService {
+
+    private final ZhiyaMapper zhiyaMapper;
+
+    @Override
+    public IPage<ZhiYaEntity> findZhiyaListInPage(ZhiYaEntity zhiYaEntity, QueryRequest request) {
+        Page<ZhiYaEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+        IPage<ZhiYaEntity> zhiyaInPage = zhiyaMapper.selectZhiyaListInPage(page, zhiYaEntity);
+        return zhiyaInPage;
+    }
+}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 89b6652..4302dbb 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -15,14 +15,17 @@
       datasource:
         # 数据源-1,名称为 base
         base:
+          url: jdbc:mysql://120.27.238.55:3306/db_bea?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
+          username: ct_test
+          password: 123456
 #          username: ct_test
 #          password: 123456
 #          driver-class-name: com.mysql.cj.jdbc.Driver
 #          url: jdbc:mysql://120.27.238.55:3306/kss_framework?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
-          username: db_bea
-          password: bea123!@#
+#          username: db_bea
+#          password: bea123!@#
           driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://154.91.195.155:3306/db_bea?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+#          url: jdbc:mysql://154.91.195.155:3306/db_bea?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
   redis:
     # Redis数据库索引(默认为 0)
     database: 1
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 07a5012..d1b623c 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -15,10 +15,13 @@
       datasource:
         # 数据源-1,名称为 base
         base:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://120.27.238.55:3306/db_bea?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
           username: ct_test
           password: 123456
-          driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://120.27.238.55:3306/kss_framework?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+#          username: ct_test
+#          password: 123456
+#          url: jdbc:mysql://120.27.238.55:3306/kss_framework?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
 
   redis:
     # Redis数据库索引(默认为 0)
diff --git a/src/main/resources/mapper/modules/ZhiyaMapper.xml b/src/main/resources/mapper/modules/ZhiyaMapper.xml
new file mode 100644
index 0000000..cfe5909
--- /dev/null
+++ b/src/main/resources/mapper/modules/ZhiyaMapper.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xcong.excoin.modules.zhiya.mapper.ZhiyaMapper">
+
+     <select id="selectZhiyaListInPage" resultType="com.xcong.excoin.modules.zhiya.entity.ZhiYaEntity">
+        SELECT
+			a.*,
+               b.phone phone,
+               b.invite_id inviteId
+		FROM
+		 zhi_ya a
+		 inner join member b on a.member_id = b.id
+        <where>
+            <if test="record != null" >
+                <if test="record.account!=null and record.account!=''">
+                    and (b.phone like CONCAT('%',#{record.account},'%')
+                             or b.email like CONCAT('%',#{record.account},'%')
+                             or b.invite_id like CONCAT('%',#{record.account},'%'))
+                </if>
+            </if>
+        </where>
+        order by a.create_time desc
+    </select>
+	
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/zhiya/zhiyaList.html b/src/main/resources/templates/febs/views/modules/zhiya/zhiyaList.html
new file mode 100644
index 0000000..ed3486b
--- /dev/null
+++ b/src/main/resources/templates/febs/views/modules/zhiya/zhiyaList.html
@@ -0,0 +1,145 @@
+<div class="layui-fluid layui-anim febs-anim" id="febs-zhiya" 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">
+                    <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">&#xe848;</i>
+                                </div>
+                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">
+                                    <i class="layui-icon">&#xe79b;</i>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                    <table lay-filter="zhiyaTable" lay-data="{id: 'zhiyaTable'}"></table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- 表格操作栏 start -->
+<script type="text/html" id="user-option">
+    <a lay-event="edit" shiro:hasPermission="member:update">审核认证</a>
+    <a lay-event="see"><i class="layui-icon febs-edit-area febs-blue">&#xe7a5;</i></a>
+    <a lay-event="examine"><i class="layui-icon febs-edit-area febs-blue">账户详情</i></a>
+</script>
+<!-- 表格操作栏 end -->
+<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-zhiya'),
+            $query = $view.find('#query'),
+            $reset = $view.find('#reset'),
+            $limit = $view.find('#limit'),
+            $searchForm = $view.find('form'),
+            sortObject = {field: 'phone', type: null},
+            tableIns;
+
+        form.render();
+
+        // 表格初始化
+        initTable();
+
+        // 初始化表格操作栏各个按钮功能
+        table.on('tool(zhiyaTable)', function (obj) {
+            var data = obj.data,
+                layEvent = obj.event;
+
+            if (layEvent === 'edit') {
+                febs.modal.open('身份认证', 'modules/member/memberDetail/' + data.id, {
+                    btn: ['提交', '取消'],
+                    yes: function (index, layero) {
+                        $('#user-update').find('#submit').trigger('click');
+                    },
+                    btn2: function () {
+                        layer.closeAll();
+                    }
+                });
+            }
+            if (layEvent === 'addCoin') {
+                febs.modal.open( '拨币', 'modules/member/addCoin/' + data.id, {
+                    btn: ['提交', '取消'],
+                    yes: function (index, layero) {
+                        $('#user-update').find('#submit').trigger('click');
+                    },
+                    btn2: function () {
+                        layer.closeAll();
+                    }
+                });
+            }
+            if (layEvent === 'see') {
+                febs.modal.open( '身份认证', 'modules/member/memberDetail/' + data.id, {
+                    maxmin: true,
+                });
+            }
+            if (layEvent === 'examine') {
+                febs.modal.open( '个人数据详情', 'modules/member/memberDetailInfo/' + data.inviteId, {
+                    maxmin: true,
+                });
+            }
+        });
+
+
+        // 查询按钮
+        $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: 'zhiyaTable',
+                url: ctx + 'zhiya/zhiyaList',
+                cols: [[
+                    {field: 'phone', title: '手机号', minWidth: 120,align:'left'},
+                    {field: 'inviteId', title: '邀请码UID',
+                        templet: function (d) {
+                            return '<a lay-event="examine" shiro:hasPermission="user:update">'+d.inviteId+'</a>'
+                        }, minWidth: 80,align:'center'},
+                    {field: 'availableBalance', title: '可用', minWidth: 80,align:'center'},
+                    {field: 'totalBalance', title: '总共', minWidth: 80,align:'center'},
+                    {field: 'frozenBalance', title: '冻结', minWidth: 80,align:'center'},
+                    {title: '操作', title: '操作',
+                        templet: function (d) {
+                                // return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit" shiro:hasPermission="user:update">审核认证</button>'
+                                //     +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="addCoin" shiro:hasPermission="user:update">拨币</button>'
+                        }
+                        ,minWidth: 200,align:'center'}
+                ]]
+            });
+        }
+
+        // 获取查询参数
+        function getQueryParams() {
+            return {
+                account: $searchForm.find('input[name="account"]').val().trim(),
+            };
+        }
+
+    })
+</script>
\ No newline at end of file

--
Gitblit v1.9.1