xiaoyong931011
2021-05-18 9909c23061541816b21d560f765d0a7274fc6323
20210518  商户审核
6 files modified
3 files added
382 ■■■■■ changed files
src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java 2 ●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/controller/OtcController.java 56 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/controller/ViewController.java 24 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/entity/OtcMarketBussinessEntity.java 13 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/mapper/OtcMarketBussinessMapper.java 14 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/service/OtcService.java 14 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcServiceImpl.java 70 ●●●●● patch | view | raw | blame | history
src/main/resources/mapper/modules/OtcMarketBussinessMapper.xml 26 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/otc/otcShopList.html 163 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
@@ -146,7 +146,7 @@
    private Integer isProfit;
    
    /**
     * 是否是交易员1是2否
     * 是否是商户1是2否
     */
    private Integer isTrader;
    public static final int ISTRADER_Y = 1;
src/main/java/com/xcong/excoin/modules/otc/controller/OtcController.java
@@ -1,4 +1,58 @@
package com.xcong.excoin.modules.otc.controller;
public class OtcController {
import com.xcong.excoin.common.annotation.ControllerEndpoint;
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.member.entity.MemberAccountMoneyChangeEntity;
import com.xcong.excoin.modules.otc.entity.OtcMarketBussinessEntity;
import com.xcong.excoin.modules.otc.service.OtcService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.constraints.NotNull;
import java.util.Map;
@Validated
@RestController
@RequiredArgsConstructor
@RequestMapping(value = "/otc")
public class OtcController extends BaseController {
    private final OtcService otcService;
    /**
     * 获取商户审核列表
     */
    @GetMapping("otcShopList")
    public FebsResponse otcShopList(OtcMarketBussinessEntity otcMarketBussinessEntity, QueryRequest request) {
        Map<String, Object> data = getDataTable(otcService.otcShopList(otcMarketBussinessEntity, request));
        return new FebsResponse().success().data(data);
    }
    /**
     * 商户审核---通过
     * @return
     */
    @GetMapping("agreeShop/{id}")
    @ControllerEndpoint(operation = "商户审核---通过", exceptionMessage = "通过失败")
    public FebsResponse agreeShop(@NotNull(message = "{required}") @PathVariable Long id) {
        return otcService.agreeShop(id);
    }
    /**
     * 商户审核---拒绝
     * @return
     */
    @GetMapping("disagreeShop/{id}")
    @ControllerEndpoint(operation = "商户审核---通过", exceptionMessage = "通过失败")
    public FebsResponse disagreeShop(@NotNull(message = "{required}") @PathVariable Long id) {
        return otcService.disagreeShop(id);
    }
}
src/main/java/com/xcong/excoin/modules/otc/controller/ViewController.java
@@ -1,4 +1,28 @@
package com.xcong.excoin.modules.otc.controller;
import com.xcong.excoin.common.entity.FebsConstant;
import com.xcong.excoin.common.utils.FebsUtil;
import com.xcong.excoin.modules.otc.service.OtcService;
import lombok.RequiredArgsConstructor;
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("otcView")
@RequestMapping(FebsConstant.VIEW_PREFIX + "modules/otc")
@RequiredArgsConstructor
public class ViewController {
    private final OtcService otcService;
    /**
     * 获取商户审核列表
     */
    @GetMapping("otcShopList")
    @RequiresPermissions("otcShopList:view")
    public String otcShopList() {
        return FebsUtil.view("modules/otc/otcShopList");
    }
}
src/main/java/com/xcong/excoin/modules/otc/entity/OtcMarketBussinessEntity.java
@@ -1,5 +1,6 @@
package com.xcong.excoin.modules.otc.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.xcong.excoin.common.entity.BaseEntity;
import lombok.Data;
@@ -41,5 +42,17 @@
    //平均放币时间
    private Integer avgCoinTime;
    @TableField(exist = false)
    private String account;
    @TableField(exist = false)
    private String phone;
    @TableField(exist = false)
    private String inviteId;
    @TableField(exist = false)
    private String realName;
}
src/main/java/com/xcong/excoin/modules/otc/mapper/OtcMarketBussinessMapper.java
New file
@@ -0,0 +1,14 @@
package com.xcong.excoin.modules.otc.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.otc.entity.OtcMarketBussinessEntity;
import org.apache.ibatis.annotations.Param;
public interface OtcMarketBussinessMapper extends BaseMapper<OtcMarketBussinessEntity> {
    IPage<OtcMarketBussinessEntity> otcShopList(Page<OtcMarketBussinessEntity> page,
                                                @Param("record")OtcMarketBussinessEntity otcMarketBussinessEntity);
}
src/main/java/com/xcong/excoin/modules/otc/service/OtcService.java
@@ -1,4 +1,16 @@
package com.xcong.excoin.modules.otc.service;
public interface OtcService {
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.xcong.excoin.common.entity.FebsResponse;
import com.xcong.excoin.common.entity.QueryRequest;
import com.xcong.excoin.modules.otc.entity.OtcMarketBussinessEntity;
public interface OtcService extends IService<OtcMarketBussinessEntity> {
    IPage<OtcMarketBussinessEntity> otcShopList(OtcMarketBussinessEntity otcMarketBussinessEntity, QueryRequest request);
    FebsResponse agreeShop(Long id);
    FebsResponse disagreeShop(Long id);
}
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcServiceImpl.java
@@ -1,4 +1,72 @@
package com.xcong.excoin.modules.otc.service.impl;
public class OtcServiceImpl {
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.FebsResponse;
import com.xcong.excoin.common.entity.QueryRequest;
import com.xcong.excoin.modules.member.entity.MemberAccountMoneyChangeEntity;
import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.member.mapper.MemberMapper;
import com.xcong.excoin.modules.otc.entity.OtcMarketBussinessEntity;
import com.xcong.excoin.modules.otc.mapper.OtcMarketBussinessMapper;
import com.xcong.excoin.modules.otc.service.OtcService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
@Service
@RequiredArgsConstructor
public class OtcServiceImpl extends ServiceImpl<OtcMarketBussinessMapper, OtcMarketBussinessEntity> implements OtcService {
    @Resource
    private OtcMarketBussinessMapper otcMarketBussinessMapper;
    @Resource
    private MemberMapper memberMapper;
    @Override
    public IPage<OtcMarketBussinessEntity> otcShopList(OtcMarketBussinessEntity otcMarketBussinessEntity, QueryRequest request) {
        Page<OtcMarketBussinessEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<OtcMarketBussinessEntity> otcMarketBussinessEntitys = otcMarketBussinessMapper.otcShopList(page, otcMarketBussinessEntity);
        return otcMarketBussinessEntitys;
    }
    @Override
    @Transactional
    public FebsResponse agreeShop(Long id) {
        OtcMarketBussinessEntity otcMarketBussinessEntity = otcMarketBussinessMapper.selectById(id);
        Integer status = otcMarketBussinessEntity.getStatus();
        if(OtcMarketBussinessEntity.STATUS_ONE != status){
            return new FebsResponse().fail().message("当前状态不是待审核");
        }
        otcMarketBussinessEntity.setStatus(OtcMarketBussinessEntity.STATUS_TWO);
        otcMarketBussinessMapper.updateById(otcMarketBussinessEntity);
        long memberId = otcMarketBussinessEntity.getMemberId();
        MemberEntity memberEntity = memberMapper.selectById(memberId);
        memberEntity.setIsTrader(MemberEntity.ISTRADER_Y);
        memberMapper.updateById(memberEntity);
        return new FebsResponse().success();
    }
    @Override
    @Transactional
    public FebsResponse disagreeShop(Long id) {
        OtcMarketBussinessEntity otcMarketBussinessEntity = otcMarketBussinessMapper.selectById(id);
        Integer status = otcMarketBussinessEntity.getStatus();
        if(OtcMarketBussinessEntity.STATUS_ONE != status){
            return new FebsResponse().fail().message("当前状态不是待审核");
        }
        otcMarketBussinessEntity.setStatus(OtcMarketBussinessEntity.STATUS_THREE);
        otcMarketBussinessMapper.updateById(otcMarketBussinessEntity);
        long memberId = otcMarketBussinessEntity.getMemberId();
        MemberEntity memberEntity = memberMapper.selectById(memberId);
        memberEntity.setIsTrader(MemberEntity.ISTRADER_Y);
        memberMapper.updateById(memberEntity);
        return new FebsResponse().success();
    }
}
src/main/resources/mapper/modules/OtcMarketBussinessMapper.xml
New file
@@ -0,0 +1,26 @@
<?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.otc.mapper.OtcMarketBussinessMapper">
    <select id="otcShopList" resultType="com.xcong.excoin.modules.otc.entity.OtcMarketBussinessEntity">
        SELECT
        *,
        concat(b.first_name,b.second_name) realName
        FROM
        otc_market_bussiness a
        LEFT JOIN member m ON m.id = a.member_id
        LEFT JOIN member_authentication b ON b.member_id = a.member_id
        <where>
            <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})
                </if>
                <if test="record.status!=null and record.status!=''">
                    and a.status= #{record.status}
                </if>
            </if>
        </where>
        order by m.create_time desc
    </select>
</mapper>
src/main/resources/templates/febs/views/modules/otc/otcShopList.html
New file
@@ -0,0 +1,163 @@
<div class="layui-fluid layui-anim febs-anim" id="febs-user" lay-title="OTC商户">
    <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">
                                            <select name="status">
                                                <option value="">请选择</option>
                                                <option value="1">待审核</option>
                                                <option value="2">审核通过</option>
                                                <option value="3">审核拒绝</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">&#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="userTable" lay-data="{id: 'userTable'}"></table>
                </div>
            </div>
        </div>
    </div>
</div>
<!-- 表格操作栏 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="edit" shiro:hasPermission="user:update"><i
            class="layui-icon febs-edit-area febs-blue">&#xe7a5;</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-user'),
            $query = $view.find('#query'),
            $reset = $view.find('#reset'),
            $searchForm = $view.find('form'),
            sortObject = {field: 'phone', type: null},
            tableIns;
        form.render();
        // 表格初始化
        initTable();
        // 初始化表格操作栏各个按钮功能
        table.on('tool(userTable)', function (obj) {
            var data = obj.data,
                layEvent = obj.event;
            if (layEvent === 'agreeShop') {
                febs.modal.confirm('通过', '确认通过该商户的审核?', function () {
                    agreeShop(data.id);
                });
            }
            if (layEvent === 'disagreeShop') {
                febs.modal.confirm('拒绝', '确认拒绝该商户的审核?', function () {
                    disagreeShop(data.id);
                });
            }
        });
        function agreeShop(id) {
            febs.get(ctx + 'otc/agreeShop/' + id, null, function () {
                febs.alert.success('通过成功');
                $query.click();
            });
        }
        function disagreeShop(id) {
            febs.get(ctx + 'otc/disagreeShop/' + id, null, function () {
                febs.alert.success('拒绝成功');
                $query.click();
            });
        }
        // 查询按钮
        $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: 'userTable',
                url: ctx + 'otc/otcShopList',
                cols: [[
                    {field: 'phone', title: '手机号', minWidth: 150,align:'left'},
                    {field: 'realName', title: '姓名', minWidth: 100,align:'left'},
                    {field: 'inviteId', title: '邀请码', minWidth: 80,align:'center'},
                    {field: 'nikename', title: '昵称', minWidth: 80,align:'center'},
                    {field: 'status', title: '审核状态',
                        templet: function (d) {
                            if (d.status === 1) {
                                return '<span style="color:blue;">待审核</span>'
                            } else if (d.status === 2) {
                                return '<span style="color:green;">审核通过</span>'
                            } else if (d.status === 3) {
                                return '<span>拒绝</span>'
                            }else{
                                return ''
                            }
                        }, minWidth: 80,align:'center'},
                    {field: 'buyCnt', title: '服务人数',minWidth: 100,align:'center'},
                    {field: 'totalOrderCnt', title: '总单数',minWidth: 100,align:'center'},
                    {field: 'finishRatio', title: '完成率',minWidth: 100,align:'center'},
                    {field: 'avgPayTime', title: '平均付款时间',minWidth: 100,align:'center'},
                    {field: 'avgCoinTime', title: '平均放币时间',minWidth: 100,align:'center'},
                    {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="agreeShop" shiro:hasPermission="user:update">同意</button>'
                                        +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="disagreeShop" shiro:hasPermission="user:update">拒绝</button>'
                            }else{
                                return ''
                            }
                        },minWidth: 200,align:'center'}
                ]]
            });
        }
        // 获取查询参数
        function getQueryParams() {
            return {
                account: $searchForm.find('input[name="account"]').val().trim(),
                status: $searchForm.find("select[name='status']").val(),
            };
        }
    })
</script>