exchange-back.git

parent: ef9458e6 | patch | commit | ignore whitespace

zainali5120

2020-10-21 effa60096f73d999e36182a08f79fad396426667

交易所私募显示标签

5 files modified

	src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java	7 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/com/xcong/excoin/modules/trademanage/entity/OrderCoinsDealEntity.java	2 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/mapper/modules/OrderCoinDealMapper.xml	2 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/templates/febs/views/modules/member/member.html	36 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/templates/febs/views/modules/orderCoin/orderCoin.html	11 ●●●●● patch \| view \| raw \| blame \| history

 src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java

@@ -150,7 +150,12 @@
     * 是否设置预估强平价系数 0-否1-是

     */

    private Integer isForce;

    


    /**

     *  是否私募

     */

    private Integer ipo;



    @TableField(exist = false)

    private String account;

    


 src/main/java/com/xcong/excoin/modules/trademanage/entity/OrderCoinsDealEntity.java

@@ -78,4 +78,6 @@
    private String phone;
    private String email;

    private Integer ipo;

}

 src/main/resources/mapper/modules/OrderCoinDealMapper.xml

@@ -4,7 +4,7 @@

    <select id="selectOrderCoinsDealListInPage" resultType="com.xcong.excoin.modules.trademanage.entity.OrderCoinsDealEntity">
        SELECT
            s.*,m.phone,m.email
            s.*,m.phone,m.email,m.ipo
        FROM
        coins_order_deal s
        LEFT JOIN member m ON m.id = s.member_id

 src/main/resources/templates/febs/views/modules/member/member.html

@@ -128,24 +128,24 @@
                id: 'userTable',

                url: ctx + 'member/getList',

                cols: [[

                    {field: 'phone', title: '手机号', minWidth: 100,align:'left'},

                    {field: 'email', title: '邮箱', minWidth: 200,align:'left'},

                    {field: 'realName', title: '姓名', minWidth: 200,align:'left'},

                    {field: 'phone', title: '手机号', minWidth: 150,align:'left'},

                    {field: 'email', title: '邮箱', minWidth: 100,align:'left'},

                    {field: 'realName', title: '姓名', minWidth: 50,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: 'refererId', title: '上级邀请码UID', minWidth: 80,align:'center'},

                    {field: 'accountType', title: '账号类型',

                        templet: function (d) {

                            if (d.accountType === 2) {

                                return '<span style="color:green;">测试账号</span>'

                            } else if (d.accountType === 1) {

                                return '<span style="color:red;">正常账号</span>'

                            }else{

                                return ''

                            }

                        }, minWidth: 80,align:'center'},

                    // {field: 'accountType', title: '账号类型',

                    //     templet: function (d) {

                    //         if (d.accountType === 2) {

                    //             return '<span style="color:green;">测试账号</span>'

                    //         } else if (d.accountType === 1) {

                    //             return '<span style="color:red;">正常账号</span>'

                    //         }else{

                    //             return ''

                    //         }

                    //     }, minWidth: 80,align:'center'},

                    {field: 'refererId', title: '账号状态',

                            templet: function (d) {

                                if (d.accountStatus === 1) {

@@ -156,6 +156,16 @@
                                    return ''

                                }

                            }, minWidth: 80,align:'center'},

                    {field: 'ipo', title: '私募',

                        templet: function (d) {

                            if (d.ipo === 1) {

                                return '<span style="color:red;">是</span>'

                            } else if (d.ipo === 0) {

                                return '<span style="color:gray;">否</span>'

                            }else{

                                return '<span style="color:gray;">否</span>'

                            }

                        }, minWidth: 80,align:'center'},

                    {field: 'refererId', title: '审核状态',

                                templet: function (d) {

                                    if (d.certifyStatus === 0) {


 src/main/resources/templates/febs/views/modules/orderCoin/orderCoin.html

@@ -109,6 +109,17 @@
                    {field: 'entrustPrice', title: '委托价', minWidth: 30,align:'center'},
                    {field: 'dealPrice', title: '成交价', minWidth: 30,align:'center'},
                    {field: 'dealAmount', title: '成交金额', minWidth: 30,align:'center'},
                    {field: 'ipo', title: '私募',
                        templet: function (d) {
                            if (d.ipo == 1) {
                                return '<span style="color:red;">是</span>'
                            } else if (d.ipo == 0) {
                                return '<span style="color:gray;">否</span>'
                            } else{
                                return '<span style="color:red;">是</span>'
                            }
                        },
                        minWidth: 20,align:'center'},
                    {field: 'feeAmount', title: '手续费', minWidth: 30,align:'center'},
                    {field: 'createTime', title: '创建时间', minWidth: 200,align:'center'},
                ]]

			@@ -150,7 +150,12 @@
			* 是否设置预估强平价系数 0-否1-是
			*/
			private Integer isForce;


			/**
			* 是否私募
			*/
			private Integer ipo;

			@TableField(exist = false)
			private String account;

			@@ -78,4 +78,6 @@
			private String phone;
			private String email;

			private Integer ipo;

			}

			@@ -4,7 +4,7 @@

			<select id="selectOrderCoinsDealListInPage" resultType="com.xcong.excoin.modules.trademanage.entity.OrderCoinsDealEntity">
			SELECT
			s.*,m.phone,m.email
			s.*,m.phone,m.email,m.ipo
			FROM
			coins_order_deal s
			LEFT JOIN member m ON m.id = s.member_id

			@@ -128,24 +128,24 @@
			id: 'userTable',
			url: ctx + 'member/getList',
			cols: [[
			{field: 'phone', title: '手机号', minWidth: 100,align:'left'},
			{field: 'email', title: '邮箱', minWidth: 200,align:'left'},
			{field: 'realName', title: '姓名', minWidth: 200,align:'left'},
			{field: 'phone', title: '手机号', minWidth: 150,align:'left'},
			{field: 'email', title: '邮箱', minWidth: 100,align:'left'},
			{field: 'realName', title: '姓名', minWidth: 50,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: 'refererId', title: '上级邀请码UID', minWidth: 80,align:'center'},
			{field: 'accountType', title: '账号类型',
			templet: function (d) {
			if (d.accountType === 2) {
			return '<span style="color:green;">测试账号</span>'
			} else if (d.accountType === 1) {
			return '<span style="color:red;">正常账号</span>'
			}else{
			return ''
			}
			}, minWidth: 80,align:'center'},
			// {field: 'accountType', title: '账号类型',
			// templet: function (d) {
			// if (d.accountType === 2) {
			// return '<span style="color:green;">测试账号</span>'
			// } else if (d.accountType === 1) {
			// return '<span style="color:red;">正常账号</span>'
			// }else{
			// return ''
			// }
			// }, minWidth: 80,align:'center'},
			{field: 'refererId', title: '账号状态',
			templet: function (d) {
			if (d.accountStatus === 1) {
			@@ -156,6 +156,16 @@
			return ''
			}
			}, minWidth: 80,align:'center'},
			{field: 'ipo', title: '私募',
			templet: function (d) {
			if (d.ipo === 1) {
			return '<span style="color:red;">是</span>'
			} else if (d.ipo === 0) {
			return '<span style="color:gray;">否</span>'
			}else{
			return '<span style="color:gray;">否</span>'
			}
			}, minWidth: 80,align:'center'},
			{field: 'refererId', title: '审核状态',
			templet: function (d) {
			if (d.certifyStatus === 0) {

			@@ -109,6 +109,17 @@
			{field: 'entrustPrice', title: '委托价', minWidth: 30,align:'center'},
			{field: 'dealPrice', title: '成交价', minWidth: 30,align:'center'},
			{field: 'dealAmount', title: '成交金额', minWidth: 30,align:'center'},
			{field: 'ipo', title: '私募',
			templet: function (d) {
			if (d.ipo == 1) {
			return '<span style="color:red;">是</span>'
			} else if (d.ipo == 0) {
			return '<span style="color:gray;">否</span>'
			} else{
			return '<span style="color:red;">是</span>'
			}
			},
			minWidth: 20,align:'center'},
			{field: 'feeAmount', title: '手续费', minWidth: 30,align:'center'},
			{field: 'createTime', title: '创建时间', minWidth: 200,align:'center'},
			]]