From 87a81e5696809b0cb2455bcca59aa9b7eab0084c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 11 Jun 2020 14:35:21 +0800
Subject: [PATCH] 20200611 代码提交
---
src/main/resources/mapper/modules/MemberQuickBuySaleMapper.xml | 25 ++
src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java | 1
src/main/resources/templates/febs/views/modules/member/member.html | 13
src/main/resources/templates/febs/views/modules/member/chargeUsdt.html | 302 +++++++++++++++++++++++++
src/main/java/com/xcong/excoin/modules/authentication/controller/ViewController.java | 24 ++
src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java | 13 +
src/main/java/com/xcong/excoin/modules/authentication/controller/AuthenticationController.java | 37 +++
src/main/java/com/xcong/excoin/modules/member/entity/MemberQuickBuySaleEntity.java | 87 +++++++
src/main/java/com/xcong/excoin/modules/member/mapper/MemberQuickBuySaleMapper.java | 15 +
src/main/java/com/xcong/excoin/modules/authentication/mapper/AuthenticationMapper.java | 15 +
src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java | 5
src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java | 12 +
src/main/resources/mapper/modules/AuthenticationMapper.xml | 40 +++
src/main/java/com/xcong/excoin/modules/authentication/service/Impl/AuthenticationServiceImpl.java | 32 ++
src/main/java/com/xcong/excoin/modules/authentication/service/AuthenticationService.java | 12 +
src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java | 3
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 18 +
src/main/java/com/xcong/excoin/modules/authentication/entity/MemberAuthenticationEntity.java | 58 ++++
18 files changed, 704 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/authentication/controller/AuthenticationController.java b/src/main/java/com/xcong/excoin/modules/authentication/controller/AuthenticationController.java
new file mode 100644
index 0000000..016ce28
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/authentication/controller/AuthenticationController.java
@@ -0,0 +1,37 @@
+package com.xcong.excoin.modules.authentication.controller;
+
+import java.util.Map;
+
+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 com.baomidou.mybatisplus.core.metadata.IPage;
+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.authentication.entity.MemberAuthenticationEntity;
+import com.xcong.excoin.modules.authentication.service.AuthenticationService;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 身份信息审核
+ */
+@Validated
+@RestController
+@RequiredArgsConstructor
+@RequestMapping(value = "/authentication")
+public class AuthenticationController extends BaseController{
+
+ private final AuthenticationService authenticationService;
+
+ @GetMapping("getList")
+ public FebsResponse getList(MemberAuthenticationEntity memberAuthenticationEntity, QueryRequest request) {
+ IPage<MemberAuthenticationEntity> findMemberListInPage = authenticationService.findAuthenticationListInPage(memberAuthenticationEntity, request);
+ Map<String, Object> data = getDataTable(findMemberListInPage);
+ return new FebsResponse().success().data(data);
+ }
+
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/authentication/controller/ViewController.java b/src/main/java/com/xcong/excoin/modules/authentication/controller/ViewController.java
new file mode 100644
index 0000000..8452b2e
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/authentication/controller/ViewController.java
@@ -0,0 +1,24 @@
+package com.xcong.excoin.modules.authentication.controller;
+
+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;
+
+import com.xcong.excoin.common.entity.FebsConstant;
+import com.xcong.excoin.common.utils.FebsUtil;
+
+/**
+ * 身份信息审核
+ */
+@Controller("authenticationView")
+@RequestMapping(FebsConstant.VIEW_PREFIX + "authentication/confirm")
+public class ViewController {
+
+ @GetMapping("authentication")
+ @RequiresPermissions("authentication:view")
+ public String authenticationConfirmToPage() {
+ return FebsUtil.view("modules/authentication/authentication");
+ }
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/authentication/entity/MemberAuthenticationEntity.java b/src/main/java/com/xcong/excoin/modules/authentication/entity/MemberAuthenticationEntity.java
new file mode 100644
index 0000000..a98d50a
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/authentication/entity/MemberAuthenticationEntity.java
@@ -0,0 +1,58 @@
+package com.xcong.excoin.modules.authentication.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.xcong.excoin.common.entity.BaseEntity;
+import lombok.Data;
+
+@Data
+@TableName("member_authentication")
+public class MemberAuthenticationEntity extends BaseEntity{
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+ /**
+ * 用户ID
+ */
+ private Long memberId;
+
+ /**
+ * 真实姓名
+ */
+ private String realName;
+
+ /**
+ * 姓
+ */
+ private String firstName;
+
+ /**
+ * 名
+ */
+ private String secondName;
+
+ /**
+ * 国家
+ */
+ private String nation;
+ /**
+ * 身份证号
+ */
+ private String idcardNo;
+
+ /**
+ * 身份证正面
+ */
+ private String idcardImageFront;
+
+ /**
+ * 身份证背面
+ */
+ private String idcardImageBack;
+
+ /**
+ * 手持身份证
+ */
+ private String idcardImageInHand;
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/authentication/mapper/AuthenticationMapper.java b/src/main/java/com/xcong/excoin/modules/authentication/mapper/AuthenticationMapper.java
new file mode 100644
index 0000000..58eb6a5
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/authentication/mapper/AuthenticationMapper.java
@@ -0,0 +1,15 @@
+package com.xcong.excoin.modules.authentication.mapper;
+
+import org.apache.ibatis.annotations.Param;
+
+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.authentication.entity.MemberAuthenticationEntity;
+
+public interface AuthenticationMapper extends BaseMapper<MemberAuthenticationEntity> {
+
+ IPage<MemberAuthenticationEntity> selectAuthenticationListInPage(Page<MemberAuthenticationEntity> page,
+ @Param("record") MemberAuthenticationEntity memberAuthenticationEntity);
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/authentication/service/AuthenticationService.java b/src/main/java/com/xcong/excoin/modules/authentication/service/AuthenticationService.java
new file mode 100644
index 0000000..397d40d
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/authentication/service/AuthenticationService.java
@@ -0,0 +1,12 @@
+package com.xcong.excoin.modules.authentication.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.authentication.entity.MemberAuthenticationEntity;
+
+public interface AuthenticationService extends IService<MemberAuthenticationEntity>{
+
+ IPage<MemberAuthenticationEntity> findAuthenticationListInPage(MemberAuthenticationEntity memberAuthenticationEntity, QueryRequest request);
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/authentication/service/Impl/AuthenticationServiceImpl.java b/src/main/java/com/xcong/excoin/modules/authentication/service/Impl/AuthenticationServiceImpl.java
new file mode 100644
index 0000000..7fbb918
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/authentication/service/Impl/AuthenticationServiceImpl.java
@@ -0,0 +1,32 @@
+package com.xcong.excoin.modules.authentication.service.Impl;
+
+import java.awt.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+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.authentication.entity.MemberAuthenticationEntity;
+import com.xcong.excoin.modules.authentication.mapper.AuthenticationMapper;
+import com.xcong.excoin.modules.authentication.service.AuthenticationService;
+import com.xcong.excoin.modules.member.mapper.MemberMapper;
+
+@Service
+public class AuthenticationServiceImpl extends ServiceImpl<AuthenticationMapper, MemberAuthenticationEntity> implements AuthenticationService{
+
+ @Resource
+ MemberMapper memberMapper;
+
+ @Override
+ public IPage<MemberAuthenticationEntity> findAuthenticationListInPage(MemberAuthenticationEntity memberAuthenticationEntity,
+ QueryRequest request) {
+
+ Page<MemberAuthenticationEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return this.baseMapper.selectAuthenticationListInPage(page, memberAuthenticationEntity);
+ }
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
index d0002ee..cc2dd48 100644
--- a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
+++ b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
@@ -4,6 +4,7 @@
import com.xcong.excoin.common.entity.FebsResponse;
import com.xcong.excoin.common.entity.QueryRequest;
import com.xcong.excoin.modules.member.entity.MemberEntity;
+import com.xcong.excoin.modules.member.entity.MemberQuickBuySaleEntity;
import com.xcong.excoin.modules.member.service.IMemberService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -32,4 +33,16 @@
Map<String, Object> data = getDataTable(memberService.findMemberListInPage(member, request));
return new FebsResponse().success().data(data);
}
+
+ /**
+ * 会员USDT充值
+ * @param member
+ * @param request
+ * @return
+ */
+ @GetMapping("memberChargeUsdt")
+ public FebsResponse memberChargeUsdt(MemberQuickBuySaleEntity memberQuickBuySaleEntity, QueryRequest request) {
+ Map<String, Object> data = getDataTable(memberService.findmemberQuickBuySaleListInPage(memberQuickBuySaleEntity, request));
+ return new FebsResponse().success().data(data);
+ }
}
diff --git a/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java b/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java
index c7e9b55..6c34410 100644
--- a/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java
+++ b/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java
@@ -20,4 +20,16 @@
public String member() {
return FebsUtil.view("modules/member/member");
}
+
+ /**
+ * 会员充值USDT记录
+ * @return
+ */
+ @GetMapping("chargeUsdt")
+ @RequiresPermissions("chargeUsdt:view")
+ public String chargeUsdt() {
+ return FebsUtil.view("modules/member/chargeUsdt");
+ }
+
+
}
diff --git a/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java b/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
index c259a34..b3fa8e4 100644
--- a/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
@@ -19,6 +19,11 @@
public class MemberEntity extends BaseEntity {
/**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
* 账号状态 - 禁用
*/
public static final Integer ACCOUNT_STATUS_DISABLED = 0;
diff --git a/src/main/java/com/xcong/excoin/modules/member/entity/MemberQuickBuySaleEntity.java b/src/main/java/com/xcong/excoin/modules/member/entity/MemberQuickBuySaleEntity.java
new file mode 100644
index 0000000..772e54f
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/member/entity/MemberQuickBuySaleEntity.java
@@ -0,0 +1,87 @@
+package com.xcong.excoin.modules.member.entity;
+
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.xcong.excoin.common.entity.BaseEntity;
+
+import lombok.Data;
+
+@Data
+@TableName("member_quick_buy_sale")
+public class MemberQuickBuySaleEntity extends BaseEntity{/**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 订单状态 1-新建
+ */
+ public static final Integer CHARGE_STATUS_CREATE = 1;
+
+ /**
+ * 订单状态 2-已付款
+ */
+ public static final Integer CHARGE_STATUS_PAID = 2;
+
+ /**
+ * 订单状态 3-已审核
+ */
+ public static final Integer CHARGE_STATUS_CHECKED = 3;
+
+ /**
+ * 订单状态 4-撤单
+ */
+ public static final Integer CHARGE_STATUS_CANCEL_USER = 4;
+
+ /**
+ * 订单状态 5-系统取消
+ */
+ public static final Integer CHARGE_STATUS_CANCEL_SYSTEM = 5;
+
+ /**
+ * 用户Id
+ */
+ private Long memberId;
+ /**
+ * 金额(人民币)
+ */
+ private BigDecimal amountCny;
+ /**
+ * 金额(USDT)
+ */
+ private BigDecimal amountUsdt;
+ /**
+ * 付款方式 1-支付宝2-微信3-银行卡
+ */
+ private Integer paymentType;
+ /**
+ * 收款账号
+ */
+ private String paymentAccount;
+ /**
+ * 收款人姓名
+ */
+ private String paymentName;
+ /**
+ * 支付码
+ */
+ private String paymentCode;
+ /**
+ * 单价
+ */
+ private BigDecimal unitPrice;
+ /**
+ * 订单状态 1-新建2-已付款3-已审核4-撤单5-系统取消
+ */
+ private int orderStatus;
+ /**
+ * 订单编号
+ */
+ private String orderNo;
+ /**
+ * 订单类型 B买入 S卖出
+ */
+ private String orderType;
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java b/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java
index 788d97b..2780518 100644
--- a/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java
+++ b/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java
@@ -13,4 +13,5 @@
public interface MemberMapper extends BaseMapper<MemberEntity> {
IPage<MemberEntity> selectMemberListInPage(Page<MemberEntity> page, @Param("record") MemberEntity memberEntity);
+
}
diff --git a/src/main/java/com/xcong/excoin/modules/member/mapper/MemberQuickBuySaleMapper.java b/src/main/java/com/xcong/excoin/modules/member/mapper/MemberQuickBuySaleMapper.java
new file mode 100644
index 0000000..80f9acf
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/member/mapper/MemberQuickBuySaleMapper.java
@@ -0,0 +1,15 @@
+package com.xcong.excoin.modules.member.mapper;
+
+import org.apache.ibatis.annotations.Param;
+
+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.member.entity.MemberQuickBuySaleEntity;
+
+public interface MemberQuickBuySaleMapper extends BaseMapper<MemberQuickBuySaleEntity> {
+
+ IPage<MemberQuickBuySaleEntity> findmemberQuickBuySaleListInPage(Page<MemberQuickBuySaleEntity> page,
+ @Param("record")MemberQuickBuySaleEntity memberQuickBuySaleEntity);
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java b/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java
index 4b0a602..4c20c8c 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.xcong.excoin.common.entity.QueryRequest;
import com.xcong.excoin.modules.member.entity.MemberEntity;
+import com.xcong.excoin.modules.member.entity.MemberQuickBuySaleEntity;
/**
* @author helius
@@ -11,4 +12,6 @@
public interface IMemberService extends IService<MemberEntity> {
IPage<MemberEntity> findMemberListInPage(MemberEntity memberEntity, QueryRequest request);
+
+ IPage<MemberQuickBuySaleEntity> findmemberQuickBuySaleListInPage(MemberQuickBuySaleEntity memberQuickBuySaleEntity, QueryRequest request);
}
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index 332c400..b15ca7e 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -5,23 +5,35 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xcong.excoin.common.entity.QueryRequest;
import com.xcong.excoin.modules.member.entity.MemberEntity;
+import com.xcong.excoin.modules.member.entity.MemberQuickBuySaleEntity;
import com.xcong.excoin.modules.member.mapper.MemberMapper;
+import com.xcong.excoin.modules.member.mapper.MemberQuickBuySaleMapper;
import com.xcong.excoin.modules.member.service.IMemberService;
-import org.springframework.stereotype.Service;
-import java.util.Map;
+import lombok.RequiredArgsConstructor;
+
+import org.springframework.stereotype.Service;
/**
* @author wzy
* @date 2020-06-10
**/
@Service
+@RequiredArgsConstructor
public class MemberServiceImpl extends ServiceImpl<MemberMapper, MemberEntity> implements IMemberService {
-
+
+ private final MemberQuickBuySaleMapper memberQuickBuySaleMapper;
@Override
public IPage<MemberEntity> findMemberListInPage(MemberEntity memberEntity, QueryRequest request) {
Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.baseMapper.selectMemberListInPage(page, memberEntity);
}
+
+ @Override
+ public IPage<MemberQuickBuySaleEntity> findmemberQuickBuySaleListInPage(
+ MemberQuickBuySaleEntity memberQuickBuySaleEntity, QueryRequest request) {
+ Page<MemberQuickBuySaleEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return memberQuickBuySaleMapper.findmemberQuickBuySaleListInPage(page, memberQuickBuySaleEntity);
+ }
}
diff --git a/src/main/resources/mapper/modules/AuthenticationMapper.xml b/src/main/resources/mapper/modules/AuthenticationMapper.xml
new file mode 100644
index 0000000..329c86c
--- /dev/null
+++ b/src/main/resources/mapper/modules/AuthenticationMapper.xml
@@ -0,0 +1,40 @@
+<?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.authentication.mapper.AuthenticationMapper">
+
+
+ <select id="selectAuthenticationListInPage" resultType="com.xcong.excoin.modules.authentication.entity.MemberAuthenticationEntity">
+ select * from member a LEFT JOIN member_authentication m on m.member_id = a.id
+ <where>
+ <if test="record != null" >
+ <if test="record.startTime!=null">
+ and create_time >=#{record.startTime}
+ </if>
+ <if test="record.endTime!=null">
+ and #{record.endTime} >= create_time
+ </if>
+ <if test="record.account!=null and record.account!=''">
+ and (phone = #{record.account} or email = #{record.account} or invite_id=#{record.account})
+ </if>
+ <if test="record.accountStatus!=null">
+ and account_status = #{record.accountStatus}
+ </if>
+ <if test="record.accountType != null" >
+ and account_type = #{record.accountType}
+ </if>
+ <if test="record.certifyStatus != null">
+ and certify_status = #{record.certifyStatus}
+ </if>
+ </if>
+ </where>
+ order by create_time desc
+ </select>
+
+ <select id="selectMemberListInPage" resultType="com.xcong.excoin.modules.member.entity.MemberEntity">
+
+ select * from member order by create_time desc
+
+ </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/modules/MemberQuickBuySaleMapper.xml b/src/main/resources/mapper/modules/MemberQuickBuySaleMapper.xml
new file mode 100644
index 0000000..5cd0bf9
--- /dev/null
+++ b/src/main/resources/mapper/modules/MemberQuickBuySaleMapper.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.member.mapper.MemberQuickBuySaleMapper">
+
+
+ <select id="findmemberQuickBuySaleListInPage" resultType="com.xcong.excoin.modules.member.entity.MemberQuickBuySaleEntity">
+ select * from member_quick_buy_sale s left join member m on m.id = s.member_id
+ <where>
+ s.order_type = 'B'
+ <if test="record != null" >
+ <if test="record.createTime!=null">
+ and s.create_time >=#{record.createTime}
+ </if>
+ <if test="record.memberId!=null">
+ and (m.phone = #{record.memberId} or m.email = #{record.memberId} or m.invite_id=#{record.memberId})
+ </if>
+ <if test="record.orderStatus!=null" >
+ and s.order_status = #{record.orderStatus}
+ </if>
+ </if>
+ </where>
+ order by s.create_time desc
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/member/chargeUsdt.html b/src/main/resources/templates/febs/views/modules/member/chargeUsdt.html
new file mode 100644
index 0000000..2427975
--- /dev/null
+++ b/src/main/resources/templates/febs/views/modules/member/chargeUsdt.html
@@ -0,0 +1,302 @@
+<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">
+ <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 class="layui-inline">
+ <label class="layui-form-label layui-form-label-sm">创建时间</label>
+ <div class="layui-input-inline">
+ <input type="text" name="createTime" id="user-createTime" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label layui-form-label-sm">订单状态</label>
+ <div class="layui-input-inline">
+ <select name="orderStatus">
+ <option value=""></option>
+ <option value="1">新建</option>
+ <option value="2">已付款</option>
+ <option value="3">已审核</option>
+ <option value="4">撤单</option>
+ <option value="5">系统取消</option>
+ </select>
+ </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 class="layui-btn layui-btn-sm layui-btn-primary table-action action-more"
+ shiro:hasAnyPermissions="user:add,user:update,user:password:reset,user:export">
+ <i class="layui-icon"></i>
+ </div>
+ </div>
+ </div>
+ </form>
+ <table lay-filter="userTable" lay-data="{id: 'userTable'}"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<!-- 表格字段状态格式化 start -->
+<script type="text/html" id="certify-status">
+ {{#
+ var certifyStatus = {
+ 0: {title: '未通过', color: 'red'},
+ 1: {title: '审核中', color: 'blue'},
+ 2: {title: '审核通过', color: 'green'},
+ 3: {title: '未实名', color: 'cyan'}
+ }[d.certifyStatus];
+ }}
+ <span class="layui-badge febs-tag-{{certifyStatus.color}}">{{ certifyStatus.title }}</span>
+</script>
+<script type="text/html" id="order-Status">
+ {{#
+ var orderStatus = {
+ 1: {title: '新建' , color: 'green'},
+ 2: {title: '已付款' , color: 'red'}
+ 3: {title: '已审核' , color: 'green'},
+ 4: {title: '撤单' , color: 'red'}
+ 5: {title: '系统取消' , color: 'red'}
+ }[d.orderStatus];
+ }}
+ <span class="layui-badge febs-tag-{{orderStatus.color}}">{{ orderStatus.title }}</span>
+</script>
+<script type="text/html" id="account-status">
+ {{#
+ var accountStatus = {
+ 1: {title: '正常', color : 'blue'},
+ 0: {title: '禁用', color : 'red'}
+ }[d.accountStatus];
+ }}
+ <span class="layui-badge febs-bg-{{accountStatus.color}}">{{ accountStatus.title }}</span>
+</script>
+<!-- 表格字段状态格式化 start -->
+
+<!-- 表格操作栏 start -->
+<script type="text/html" id="user-option">
+ <span shiro:lacksPermission="user:view,user:update,user:delete">
+ <span class="layui-badge-dot febs-bg-orange"></span> 无权限
+ </span>
+ <a lay-event="detail" shiro:hasPermission="user:view"><i
+ class="layui-icon febs-edit-area febs-green"></i></a>
+ <a lay-event="edit" shiro:hasPermission="user:update"><i
+ class="layui-icon febs-edit-area febs-blue"></i></a>
+ <a lay-event="del" shiro:hasPermission="user:delete"><i class="layui-icon febs-edit-area febs-red"></i></a>
+</script>
+<!-- 表格操作栏 end -->
+<script data-th-inline="none" type="text/javascript">
+ // 引入组件并初始化
+ layui.use(['dropdown', 'jquery', 'laydate', 'form', 'table', 'febs', 'treeSelect'], function () {
+ var $ = layui.jquery,
+ laydate = layui.laydate,
+ febs = layui.febs,
+ form = layui.form,
+ table = layui.table,
+ treeSelect = layui.treeSelect,
+ dropdown = layui.dropdown,
+ $view = $('#febs-user'),
+ $query = $view.find('#query'),
+ $reset = $view.find('#reset'),
+ $searchForm = $view.find('form'),
+ sortObject = {field: 'createTime', type: null},
+ tableIns,
+ createTimeFrom,
+ createTimeTo;
+
+ form.render();
+
+ // 表格初始化
+ initTable();
+
+ // 时间组件
+ laydate.render({
+ elem: '#user-createTime',
+ range: true,
+ trigger: 'click'
+ });
+
+ // 新增下拉组件
+ /**
+
+ dropdown.render({
+ elem: $view.find('.action-more'),
+ click: function (name, elem, event) {
+ var checkStatus = table.checkStatus('userTable');
+ if (name === 'add') {
+ febs.modal.open('新增用户', 'system/user/add', {
+ btn: ['提交', '重置'],
+ area: $(window).width() <= 750 ? '95%' : '50%',
+ offset: '30px',
+ yes: function (index, layero) {
+ $('#user-add').find('#submit').trigger('click');
+ },
+ btn2: function () {
+ $('#user-add').find('#reset').trigger('click');
+ return false;
+ }
+ });
+ }
+ if (name === 'delete') {
+ if (!checkStatus.data.length) {
+ febs.alert.warn('请选择需要删除的用户');
+ } else {
+ febs.modal.confirm('删除用户', '确定删除该用户？', function () {
+ var userIds = [];
+ layui.each(checkStatus.data, function (key, item) {
+ userIds.push(item.userId)
+ });
+ deleteUsers(userIds.join(','));
+ });
+ }
+ }
+ if (name === 'reset') {
+ if (!checkStatus.data.length) {
+ febs.alert.warn('请选择需要重置密码的用户');
+ } else {
+ var usernames = [];
+ layui.each(checkStatus.data, function (key, item) {
+ usernames.push(item.username)
+ });
+ febs.post(ctx + 'user/password/reset/' + usernames.join(','), null, function () {
+ febs.alert.success('所选用户密码已重置为1234qwer');
+ });
+ }
+ }
+ if (name === 'export') {
+ var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
+ params.pageSize = $view.find(".layui-laypage-limits option:selected").val();
+ params.pageNum = $view.find(".layui-laypage-em").next().html();
+ febs.download(ctx + 'user/excel', params, '用户信息表.xlsx');
+ }
+ },
+ options: [{
+ name: 'add',
+ title: '新增用户',
+ perms: 'user:add'
+ }, {
+ name: 'delete',
+ title: '删除用户',
+ perms: 'user:delete'
+ }, {
+ name: 'reset',
+ title: '密码重置',
+ perms: 'user:password:reset'
+ }, {
+ name: 'export',
+ title: '导出Excel',
+ perms: 'user:export'
+ }]
+ });
+ */
+
+ // 下拉框选择器
+ treeSelect.render({
+ elem: $view.find('#dept'),
+ type: 'get',
+ data: ctx + 'dept/select/tree',
+ placeholder: '请选择',
+ search: false
+ });
+
+ // 初始化表格操作栏各个按钮功能
+ table.on('tool(userTable)', function (obj) {
+ var data = obj.data,
+ layEvent = obj.event;
+ if (layEvent === 'detail') {
+ febs.modal.view('用户信息', 'system/user/detail/' + data.username, {
+ area: $(window).width() <= 750 ? '95%' : '660px'
+ });
+ }
+ if (layEvent === 'del') {
+ febs.modal.confirm('删除用户', '确定删除该用户？', function () {
+ deleteUsers(data.userId);
+ });
+ }
+ if (layEvent === 'edit') {
+ febs.modal.open('修改用户', 'system/user/update/' + data.username, {
+ area: $(window).width() <= 750 ? '90%' : '50%',
+ offset: '30px',
+ btn: ['提交', '取消'],
+ yes: function (index, layero) {
+ $('#user-update').find('#submit').trigger('click');
+ },
+ btn2: function () {
+ layer.closeAll();
+ }
+ });
+ }
+ });
+
+ // 查询按钮
+ $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();
+ treeSelect.revokeNode('dept');
+ sortObject.type = 'null';
+ createTimeTo = null;
+ createTimeFrom = null;
+ tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
+ });
+
+ function initTable() {
+ tableIns = febs.table.init({
+ elem: $view.find('table'),
+ id: 'userTable',
+ url: ctx + 'member/memberChargeUsdt',
+ cols: [[
+ {type: 'checkbox'},
+ {field: 'memberId', title: '邀请码UID'},
+ {title: '订单状态', templet: '#order-Status'},
+ {field: 'createTime', title: '下单时间', minWidth: 180},
+ {title: '操作', toolbar: '#user-option', minWidth: 140, fixed : 'right'}
+ ]]
+ });
+ }
+
+ // 获取查询参数
+ function getQueryParams() {
+ var createTime = $searchForm.find('input[name="createTime"]').val();
+ if (createTime) {
+ createTimeFrom = createTime.split(' - ')[0];
+ }
+ return {
+ startTime: createTimeFrom,
+ account: $searchForm.find('input[name="account"]').val().trim(),
+ orderStatus: $searchForm.find("select[name='orderStatus']").val(),
+ };
+ }
+
+ function deleteUsers(userIds) {
+ var currentUserId = currentUser.userId + '';
+ if (('' + userIds).split(',').indexOf(currentUserId) !== -1) {
+ febs.alert.warn('所选用户包含当前登录用户，无法删除');
+ return;
+ }
+ febs.get(ctx + 'user/delete/' + userIds, null, function () {
+ febs.alert.success('删除用户成功');
+ $query.click();
+ });
+ }
+ })
+</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/member/member.html b/src/main/resources/templates/febs/views/modules/member/member.html
index e987cae..d570368 100644
--- a/src/main/resources/templates/febs/views/modules/member/member.html
+++ b/src/main/resources/templates/febs/views/modules/member/member.html
@@ -87,11 +87,11 @@
<script type="text/html" id="account-type">
{{#
var accountType = {
- 2: {title: '正常账号'},
- 1: {title: '测试账号'}
+ 2: {title: '正常账号' , color: 'green'},
+ 1: {title: '测试账号' , color: 'red'}
}[d.accountType];
}}
- <span>{{ accountType.title }}</span>
+ <span class="layui-badge febs-tag-{{accountType.color}}">{{ accountType.title }}</span>
</script>
<script type="text/html" id="account-status">
{{#
@@ -148,6 +148,8 @@
});
// 新增下拉组件
+ /**
+
dropdown.render({
elem: $view.find('.action-more'),
click: function (name, elem, event) {
@@ -217,6 +219,7 @@
perms: 'user:export'
}]
});
+ */
// 下拉框选择器
treeSelect.render({
@@ -281,8 +284,8 @@
{type: 'checkbox'},
{field: 'phone', title: '手机号', minWidth: 165},
{field: 'email', title: '邮箱', minWidth: 200},
- {field: 'inviteId', title: '邀请码'},
- {field: 'refererId', title: '上级邀请码'},
+ {field: 'inviteId', title: '邀请码UID'},
+ {field: 'refererId', title: '上级邀请码UID'},
{title: '账号类型', templet: '#account-type'},
{title: '账号状态', templet: '#account-status'},
{title: '审核状态', templet: '#certify-status'},
--
Gitblit v1.9.1