exchange-back.git

			@@ -57,7 +57,7 @@
			LEFT JOIN member m ON m.id = s.member_id
			<where>
			s.closing_type in (2,3,4,5,6,7,8,9)
			and FIND_IN_SET('22015141', m.referer_ids)
			and ( FIND_IN_SET('22015141', m.referer_ids) or m.id = 10)
			<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})
			@@ -65,6 +65,9 @@
			<if test="record.closingType!=null and record.closingType!=''">
			and s.closing_type = #{record.closingType}
			</if>
			<if test="record.isTest!=null and record.isTest!=''">
			and m.account_type= #{record.isTest}
			</if>
			</if>
			</where>
			order by s.opening_time desc

			@@ -13,6 +13,16 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label layui-form-label-sm">账号类型</label>
			<div class="layui-input-inline">
			<select name="isTest">
			<option value=""></option>
			<option value="1">正常账号</option>
			<option value="2">测试账号</option>
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label layui-form-label-sm">平仓类型</label>
			<div class="layui-input-inline">
			<select name="closingType">
			@@ -89,6 +99,7 @@
			totalRow: true,
			cols: [[
			{field: 'phone', title: '手机号', minWidth: 120,align:'left',totalRowText: '合计'},
			{field: 'realName', title: '姓名', minWidth: 120,align:'left'},
			{field: 'inviteId', title: '邀请码UID', minWidth: 120,align:'center'},
			{field: 'tradeType', title: '交易类型',
			templet: function (d) {
			@@ -179,6 +190,14 @@
			}, minWidth: 120,align:'center'},
			{field: 'orderNo', title: '订单编号', minWidth: 200,align:'center'},
			{field: 'leverRatio', title: '杠杆倍率', minWidth: 120,align:'center'},
			{field: 'accountType', title: '账号类型',
			templet: function (d) {
			if (d.accountType === 2) {
			return '<span style="color:red;">测试账号</span>'
			} else {
			return '<span style="color:green;">正常账号</span>'
			}
			},minWidth: 100,align:'center'},
			{field: 'email', title: '邮箱', minWidth: 200,align:'left'},
			]]
			});
			@@ -189,6 +208,7 @@
			return {
			account: $searchForm.find('input[name="account"]').val().trim(),
			closingType: $searchForm.find("select[name='closingType']").val(),
			isTest: $searchForm.find("select[name='isTest']").val(),
			};
			}

	src/main/java/com/xcong/excoin/modules/trademanage/entity/ContractOrderEntity.java	11 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/mapper/modules/ContractOrderMapper.xml	5 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/templates/febs/views/modules/trademanage/historyOrderAlone.html	20 ●●●●● patch \| view \| raw \| blame \| history

			@@ -212,6 +212,17 @@
			*/
			@TableField(exist = false)
			private String inviteId;

			/**
			* 账号类型
			*/
			@TableField(exist = false)
			private int accountType;
			/**
			* 查询条件：账号类型
			*/
			@TableField(exist = false)
			private String isTest;


			}