平台管理后台添加提现审核，后面提现不自动需要通过审核并且人工标记，人工转账放款

crmeb_src/mer_java/crmeb-admin/src/main/java/com/zbkj/admin/controller/platform/finance/WithdrawalHistoryController.java

@@ -0,0 +1,44 @@
+package com.zbkj.admin.controller.platform.finance;
+
+import com.github.pagehelper.PageInfo;
+import com.zbkj.common.model.user.WithdrawalHistory;
+import com.zbkj.common.request.PageParamRequest;
+import com.zbkj.common.request.WithdrawalAuditRequest;
+import com.zbkj.common.request.WithdrawalSearchRequest;
+import com.zbkj.common.result.CommonResult;
+import com.zbkj.service.service.user.WithdrawalHistoryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 提现管理控制器
+ */
+@Slf4j
+@RestController
+@RequestMapping("api/admin/platform/finance/withdrawal")
+@Api(tags = "提现管理")
+public class WithdrawalHistoryController {
+
+    @Autowired
+    private WithdrawalHistoryService withdrawalHistoryService;
+
+    @ApiOperation(value = "分页列表")
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    public CommonResult<PageInfo<WithdrawalHistory>> getList(@Validated WithdrawalSearchRequest request,
+                                                             @Validated PageParamRequest pageParamRequest) {
+        return CommonResult.success(withdrawalHistoryService.getPageList(request, pageParamRequest));
+    }
+
+    @ApiOperation(value = "审核（放款/拒绝）")
+    @RequestMapping(value = "/audit", method = RequestMethod.POST)
+    public CommonResult<Boolean> audit(@RequestBody @Validated WithdrawalAuditRequest request) {
+        if (withdrawalHistoryService.audit(request)) {
+            return CommonResult.success();
+        }
+        return CommonResult.failed();
+    }
+}

crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/model/user/WithdrawalHistory.java

@@ -3,6 +3,7 @@ package com.zbkj.common.model.user;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -82,4 +83,8 @@ public class WithdrawalHistory implements Serializable {
 
     @ApiModelProperty(value = "手续费RMB")
     private BigDecimal handlingFeeRmb;
+
+    @ApiModelProperty(value = "用户账号")
+    @TableField(exist = false)
+    private String account;
 }

crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/request/WithdrawalAuditRequest.java

@@ -0,0 +1,33 @@
+package com.zbkj.common.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 提现审核请求对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "WithdrawalAuditRequest对象", description = "提现审核")
+public class WithdrawalAuditRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "提现记录ID", required = true)
+    @NotNull(message = "提现记录ID不能为空")
+    private Integer id;
+
+    @ApiModelProperty(value = "审核状态：1已放款，2拒绝", required = true)
+    @NotNull(message = "审核状态不能为空")
+    private Integer status;
+
+    @ApiModelProperty(value = "拒绝原因/备注")
+    private String remark;
+}

crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/request/WithdrawalSearchRequest.java

@@ -0,0 +1,30 @@
+package com.zbkj.common.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 提现记录搜索请求对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "WithdrawalSearchRequest对象", description = "提现记录搜索")
+public class WithdrawalSearchRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "状态：0待处理，1已放款，2拒绝")
+    private Integer status;
+
+    @ApiModelProperty(value = "提现地址")
+    private String address;
+
+    @ApiModelProperty(value = "用户账号/ID")
+    private String account;
+}

crmeb_src/mer_java/crmeb-service/src/main/java/com/zbkj/service/dao/WithdrawalHistoryDao.java

@@ -2,6 +2,9 @@ package com.zbkj.service.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zbkj.common.model.user.WithdrawalHistory;
+import com.zbkj.common.request.WithdrawalSearchRequest;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
 
 /**
  * 用户表 Mapper 接口
@@ -17,4 +20,11 @@ import com.zbkj.common.model.user.WithdrawalHistory;
  */
 public interface WithdrawalHistoryDao extends BaseMapper<WithdrawalHistory> {
 
+    /**
+     * 获取列表
+     * 
+     * @param request 请求参数
+     * @return List
+     */
+    List<WithdrawalHistory> getList(@Param("request") WithdrawalSearchRequest request);
 }

crmeb_src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/PayServiceImpl.java

@@ -11,6 +11,7 @@ import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
@@ -931,7 +932,14 @@ public class PayServiceImpl implements PayService {
         // 提现手续费，实际到账是扣掉手续费的
         BigDecimal handlingFeeSl = request.getAmount().multiply(new BigDecimal("0.05")).setScale(2, RoundingMode.UP);
         BigDecimal amount = request.getAmount().subtract(handlingFeeSl);
-        Map<String, Object> res = DaibiUtils.withdrawalSLgns(request.getAddress(), amount.toString());
+
+        // 之前说要直接自动到账，这儿调用了接口，后面说要手动并且加审核这儿关掉
+        // Map<String, Object> res = DaibiUtils.withdrawalSLgns(request.getAddress(), amount.toString());
+        Map<String, Object> res = new HashMap<>();
+        res.put("request_id", IdUtil.fastSimpleUUID());
+        res.put("message","");
+        res.put("token","");
+        res.put("status",true);
 
         withdrawalHistory.setUid(user.getId());
         withdrawalHistory.setAddress(request.getAddress());

crmeb_src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/user/WithdrawalHistoryServiceImpl.java

@@ -0,0 +1,50 @@
+package com.zbkj.service.service.impl.user;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.zbkj.common.request.PageParamRequest;
+import com.zbkj.common.request.WithdrawalAuditRequest;
+import com.zbkj.common.request.WithdrawalSearchRequest;
+import com.zbkj.common.model.user.WithdrawalHistory;
+import com.zbkj.service.dao.WithdrawalHistoryDao;
+import com.zbkj.service.service.user.WithdrawalHistoryService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * WithdrawalHistoryService 实现类
+ */
+@Service
+public class WithdrawalHistoryServiceImpl extends ServiceImpl<WithdrawalHistoryDao, WithdrawalHistory>
+        implements WithdrawalHistoryService {
+
+    @Resource
+    private WithdrawalHistoryDao dao;
+
+    @Override
+    public PageInfo<WithdrawalHistory> getPageList(WithdrawalSearchRequest request, PageParamRequest pageParamRequest) {
+        PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
+        List<WithdrawalHistory> list = dao.getList(request);
+        return new PageInfo<>(list);
+    }
+
+    @Override
+    public Boolean audit(WithdrawalAuditRequest request) {
+        WithdrawalHistory withdrawalHistory = getById(request.getId());
+        if (withdrawalHistory == null) {
+            throw new RuntimeException("提现记录不存在");
+        }
+        if (withdrawalHistory.getStatus() != 0) {
+            throw new RuntimeException("该记录已审核");
+        }
+
+        withdrawalHistory.setStatus(request.getStatus());
+        if (request.getRemark() != null) {
+            withdrawalHistory.setRemark(request.getRemark());
+        }
+        return updateById(withdrawalHistory);
+    }
+}

crmeb_src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/user/WithdrawalHistoryService.java

@@ -0,0 +1,31 @@
+package com.zbkj.service.service.user;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.pagehelper.PageInfo;
+import com.zbkj.common.request.PageParamRequest;
+import com.zbkj.common.request.WithdrawalAuditRequest;
+import com.zbkj.common.request.WithdrawalSearchRequest;
+import com.zbkj.common.model.user.WithdrawalHistory;
+
+/**
+ * WithdrawalHistoryService 接口
+ */
+public interface WithdrawalHistoryService extends IService<WithdrawalHistory> {
+
+    /**
+     * 获取提现记录分页列表
+     * 
+     * @param request          搜索请求参数
+     * @param pageParamRequest 分页参数
+     * @return PageInfo
+     */
+    PageInfo<WithdrawalHistory> getPageList(WithdrawalSearchRequest request, PageParamRequest pageParamRequest);
+
+    /**
+     * 审核提现申请
+     * 
+     * @param request 审核请求参数
+     * @return Boolean
+     */
+    Boolean audit(WithdrawalAuditRequest request);
+}

crmeb_src/mer_java/crmeb-service/src/main/resources/mapper/user/WithdrawalHistoryMapper.xml

@@ -0,0 +1,22 @@
+<?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.zbkj.service.dao.WithdrawalHistoryDao">
+
+    <select id="getList" resultType="com.zbkj.common.model.user.WithdrawalHistory">
+        SELECT w.*, u.account as account
+        FROM eb_withdrawal_history w
+        LEFT JOIN eb_user u ON w.uid = u.id
+        WHERE w.is_del = 0
+        <if test="request.status != null">
+            AND w.status = #{request.status}
+        </if>
+        <if test="request.address != null and request.address != ''">
+            AND w.address LIKE CONCAT('%', #{request.address}, '%')
+        </if>
+        <if test="request.account != null and request.account != ''">
+            AND (u.account LIKE CONCAT('%', #{request.account}, '%') OR w.uid = #{request.account})
+        </if>
+        ORDER BY w.id DESC
+    </select>
+
+</mapper>

crmeb_src/mer_plat_admin/src/api/finance.js

@@ -196,3 +196,27 @@ export function statementsApi(params) {
     params,
   });
 }
+
+/**
+ * 提现申请列表
+ * @param params
+ */
+export function withdrawalListApi(params) {
+  return request({
+    url: '/admin/platform/finance/withdrawal/list',
+    method: 'get',
+    params,
+  });
+}
+
+/**
+ * 提现申请审核
+ * @param data
+ */
+export function withdrawalAuditApi(data) {
+  return request({
+    url: '/admin/platform/finance/withdrawal/audit',
+    method: 'post',
+    data,
+  });
+}

crmeb_src/mer_plat_admin/src/layout/navBars/breadcrumb/breadcrumb.vue

@@ -143,12 +143,17 @@ export default {
     },
     // 当前路由分割处理
     initRouteSplit(path) {
+      const menuList = this.$store.state.user.menuList;
+      if (!menuList || !menuList.length) {
+        this.breadcrumbList = [];
+        return;
+      }
       this.breadcrumbList = [
         {
           path: '/',
           meta: {
-            title: this.$store.state.user.menuList[0].title,
-            icon: this.$store.state.user.menuList[0].icon,
+            title: menuList[0].title,
+            icon: menuList[0].icon,
           },
         },
       ];
@@ -156,7 +161,7 @@ export default {
       //   this.routeSplit.shift();
       this.routeSplitFirst = path;
       this.routeSplitIndex = 1;
-      this.getBreadcrumbList(this.$store.state.user.menuList);
+      this.getBreadcrumbList(menuList);
     },
   },
   // 监听路由的变化

crmeb_src/mer_plat_admin/src/permission.js

@@ -40,11 +40,15 @@ router.beforeEach(async (to, from, next) => {
         ? store.getters.roles && store.getters.roles.length > 0
         : store.getters.circleRoles && store.getters.circleRoles.length > 0;
       if (hasRoles) {
+        if (store.state.user.menuList.length === 0) {
+          await store.dispatch('user/getMenus');
+        }
         next();
         NProgress.done();
       } else {
         try {
           const roles = await store.dispatch('user/getInfo');
+          await store.dispatch('user/getMenus');
           next({ ...to, replace: true });
         } catch (error) {
           // remove token and go to login page to re-login

crmeb_src/mer_plat_admin/src/router/modules/finance.js

@@ -56,6 +56,12 @@ const financeRouter = {
         },
       ],
     },
+    {
+      path: 'withdrawal',
+      component: () => import('@/views/finance/withdrawal/index'),
+      name: 'FinanceWithdrawal',
+      meta: { title: '提现管理', icon: '' },
+    },
     {
       path: 'charge',
       component: () => import('@/views/finance/charge/index'),

crmeb_src/mer_plat_admin/src/store/modules/user.js

@@ -18,12 +18,20 @@ import { Loading } from 'element-ui';
 import * as roleApi from '@/api/roleApi.js';
 import { formatFlatteningRoutes } from '@/utils/system.js';
 import { isPlatform } from '@/utils/settingMer';
+function safeParse(key) {
+  try {
+    const json = localStorage.getItem(key);
+    if (!json || json === 'undefined') return [];
+    return JSON.parse(json) || [];
+  } catch (e) {
+    return [];
+  }
+}
+
 function getMenusName() {
   return isPlatform
-    ? JSON.parse(localStorage.getItem('MerPlatAdmin_MenuList')) || []
-    : localStorage.getItem('Circle_Admin_MenuList')
-    ? JSON.parse(localStorage.getItem('Circle_Admin_MenuList'))
-    : [];
+    ? safeParse('MerPlatAdmin_MenuList')
+    : safeParse('Circle_Admin_MenuList');
 }
 const state = {
   token: getToken(),
@@ -47,8 +55,8 @@ const state = {
   menuList: getMenusName(),
   oneLvMenus: [],
   circleOneLvMenus: [],
-  oneLvRoutes: JSON.parse(localStorage.getItem('MerPlatAdmin_oneLvRoutes')) || [],
-  circleOneLvRoutes: JSON.parse(localStorage.getItem('Circle_Admin_oneLvRoutes')) || [],
+  oneLvRoutes: safeParse('MerPlatAdmin_oneLvRoutes'),
+  circleOneLvRoutes: safeParse('Circle_Admin_oneLvRoutes'),
   childMenuList: [],
   circleChildMenuList: [],
 };
@@ -133,7 +141,7 @@ const mutations = {
   childMenuList(state, list) {
     if (isPlatform) {
       state.childMenuList = list;
-    }else{
+    } else {
       state.circleChildMenuList = list;
     }
   },

crmeb_src/mer_plat_admin/src/views/finance/withdrawal/index.vue

@@ -0,0 +1,160 @@
+<template>
+  <div class="divBox">
+    <el-card :bordered="false" shadow="never" class="ivu-mt" :body-style="{ padding: 0 }">
+      <div class="padding-add">
+        <el-form size="small" inline @submit.native.prevent>
+          <el-form-item label="提现状态：">
+            <el-select v-model="tableFrom.status" placeholder="请选择" class="selWidth" clearable @change="getList(1)">
+              <el-option label="全部" value="" />
+              <el-option label="待处理" value="0" />
+              <el-option label="已放款" value="1" />
+              <el-option label="已拒绝" value="2" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="提现地址：">
+            <el-input v-model.trim="tableFrom.address" @keyup.enter.native="getList(1)" placeholder="请输入提现地址" class="selWidth" size="small" />
+          </el-form-item>
+          <el-form-item label="用户账号：">
+             <el-input v-model.trim="tableFrom.account" @keyup.enter.native="getList(1)" placeholder="请输入用户账号/ID" class="selWidth" size="small" />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" size="small" @click="getList(1)">查询</el-button>
+            <el-button size="small" @click="reset()">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </el-card>
+    <el-card class="box-card mt14" :body-style="{ padding: '20px' }" shadow="never" :bordered="false">
+      <el-table v-loading="listLoading" :data="tableData.data" style="width: 100%" size="small" height="500">
+        <el-table-column prop="transactionId" label="交易ID" min-width="220" :show-overflow-tooltip="true" />
+        <el-table-column prop="account" label="用户账号" min-width="120" />
+        <el-table-column label="提现金额(sL)" min-width="80">
+          <template slot-scope="scope">
+            {{ Number(scope.row.amount) + Number(scope.row.handlingFeeSl) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="amount" label="到账金额(sL)" min-width="80" />
+        <el-table-column prop="handlingFeeSl" label="手续费(sL)" min-width="100" />
+        <el-table-column prop="address" label="提现地址" min-width="200" :show-overflow-tooltip="true" />
+        <el-table-column label="状态" min-width="80">
+          <template slot-scope="scope">
+            <span v-if="scope.row.status === 0">待处理</span>
+            <span v-else-if="scope.row.status === 1" style="color:#009688">已放款</span>
+            <span v-else-if="scope.row.status === 2" style="color:#ed4014">已拒绝</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime" label="申请时间" min-width="150" />
+         <el-table-column prop="remark" label="备注" min-width="150" :show-overflow-tooltip="true" />
+        <el-table-column label="操作" width="150" fixed="right">
+          <template slot-scope="scope">
+            <template v-if="scope.row.status === 0">
+              <el-button type="text" size="small" @click="onAudit(scope.row.id, 1)">放款</el-button>
+              <el-button type="text" size="small" @click="onReject(scope.row.id)">拒绝</el-button>
+            </template>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          background
+          :page-sizes="[20, 40, 60, 80]"
+          :page-size="tableFrom.limit"
+          :current-page="tableFrom.page"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="tableData.total"
+          @size-change="handleSizeChange"
+          @current-change="pageChange"
+        />
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { withdrawalListApi, withdrawalAuditApi } from '@/api/finance';
+
+export default {
+  name: 'FinanceWithdrawal',
+  data() {
+    return {
+      tableFrom: {
+        page: 1,
+        limit: 20,
+        status: '',
+        address: '',
+        account: '',
+      },
+      listLoading: true,
+      tableData: {
+        data: [],
+        total: 0,
+      },
+    };
+  },
+  mounted() {
+    this.getList();
+  },
+  methods: {
+    getList(num) {
+      this.listLoading = true;
+      this.tableFrom.page = num ? num : this.tableFrom.page;
+      withdrawalListApi(this.tableFrom)
+        .then((res) => {
+          this.tableData.data = res.list;
+          this.tableData.total = res.total;
+          this.listLoading = false;
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    reset() {
+      this.tableFrom.status = '';
+      this.tableFrom.address = '';
+      this.tableFrom.account = '';
+      this.getList(1);
+    },
+    pageChange(page) {
+      this.tableFrom.page = page;
+      this.getList();
+    },
+    handleSizeChange(val) {
+      this.tableFrom.limit = val;
+      this.getList();
+    },
+    onAudit(id, status) {
+       this.$confirm('确定要放款吗?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+             this.submitAudit(id, status);
+        }).catch(() => {});
+    },
+    onReject(id) {
+        this.$prompt('请输入拒绝原因/备注', '拒绝提现', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+        }).then(({ value }) => {
+           this.submitAudit(id, 2, value);
+        }).catch(() => {});
+    },
+    submitAudit(id, status, remark = '') {
+        const loading = this.$loading({ lock: true, text: '处理中...', spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.7)' });
+        withdrawalAuditApi({ id, status, remark }).then(() => {
+            loading.close();
+            this.$message.success('操作成功');
+            this.getList();
+        }).catch(() => {
+            loading.close();
+        });
+    }
+  },
+};
+</script>
+
+<style scoped>
+.selWidth {
+  width: 260px;
+}
+</style>

crmeb_src/mer_uniapp/pages/users/user_payment/index.vue

@@ -28,7 +28,7 @@
 					<view class="tips-box">
 						<view class="tips mt-30">注意事项：</view>
 						<view class="tips-samll" v-for="item in noticeList" :key="item">
-							{{ item }}
+							{{ item }}--
 						</view>
 					</view>
 				</view>

crmeb_src/mer_uniapp/pages/users/user_withd_slgns/index.vue

@@ -13,6 +13,7 @@
 			</view>
 			
 			<!-- 汇率卡片 -->
+			<!--
 			<view class="rate-card">
 				<view class="rate-title-row">
 					<view class="title">实时汇率</view>
@@ -24,6 +25,7 @@
 					</view>
 				</view>
 			</view>
+			-->
 		</view>
 		
 		<!-- 提现表单区域 -->
@@ -56,7 +58,7 @@
 				<view class="note-item">02.本次提现仅支持sLGNS币种；</view>
 				<view class="note-item">03.提现将收取5%的滑点费用；</view>
 				<view class="note-item">04.请仔细核对提现地址，地址填写错误导致的资产损失，平台不予负责；</view>
-                <view class="note-item">05.提现存在3~5分钟到账延迟，若超时未到账，请及时联系平台客服。</view>
+                <view class="note-item">05.提现24小时内到账；</view>
 			</view>
 		</view>