解决合并冲突

normand/frontend/frontend/views/product/index.php

@@ -128,6 +128,7 @@
                 <h3 class="title" style="color: red;"><a target="_blank" href="<?= STATIC_URL ?>/upload/贝龙产品介绍.xlsx">
         <?php }?>
         <?php if($language == 0){?>点击查看更多<?php }else if($language == 1){?>點擊查看更多<?php }else{?>Learn more <?php }?></a></h3>
+
     </div>
 </div>
 <?php $this->beginBlock('footer_script'); ?>

normandcrm/admin/backend/models/PrivateaccountApi.php

@@ -0,0 +1,68 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2017/12/5/005
+ * Time: 9:47
+ */
+
+namespace backend\models;
+
+
+class PrivateaccountApi extends BaseApi
+{
+
+    public $apiUrl = 'private-account';
+
+
+
+    //获取所有的邮件
+    public function getConfig($data = [])
+    {
+        $result = $this->get($this->apiUrl.'/get-config', $data);
+        if ($result['code'] == 1) {
+            return $this->returnArray(1, $result['data'], '获取配置详情成功');
+        } else {
+            return $this->returnArray(0, [], $result['message']);
+        }
+    }
+
+
+    //添加新的邮箱
+    public function Save($data = [])
+    {
+        $result = $this->post($this->apiUrl.'/save', $data);
+        if ($result['code'] == 1) {
+            return $this->returnArray(1, $result['data'], '保存成功');
+        } else {
+            return $this->returnArray(0, [], $result['message']);
+        }
+    }
+
+
+
+
+    //查看邮箱的详情
+    public function View($data = [])
+    {
+        $result = $this->get($this->apiUrl.'/view', $data);
+        if ($result['code'] == 1) {
+            return $this->returnArray(1, $result['data'], '保存成功');
+        } else {
+            return $this->returnArray(0, [], $result['message']);
+        }
+    }
+
+
+    //更新配置文件
+    public function Updatepage($data = [])
+    {
+        $result = $this->post($this->apiUrl.'/updatepage', $data);
+        if ($result['code'] == 1) {
+            return $this->returnArray(1, $result['data'], $result['message']);
+        } else {
+            return $this->returnArray(0,$result['data'], '更新失败');
+        }
+    }
+
+}

normandcrm/admin/backend/modules/admin/controllers/PrivateaccountController.php

@@ -0,0 +1,77 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2017/12/5/005
+ * Time: 9:40
+ */
+
+namespace backend\modules\admin\controllers;
+
+
+use backend\models\PrivateaccountApi;
+use function GuzzleHttp\json_encode;
+use Yii;
+class PrivateaccountController extends BaseController
+{
+
+    /**
+     * 获取所有的邮箱配置
+     */
+    public function actionIndex()
+    {
+        $configAPi = new PrivateaccountApi();
+        $result = $configAPi->getConfig();
+        return $this->render('index', [
+            'config' => $result['data'],
+        ]);
+    }
+
+
+    
+
+    /**
+    * 添加页面的渲染
+    */
+    public function actionClear()
+    {
+        return $this->renderPartial('add');
+    }
+
+
+
+
+    /**
+    * 添加页面的渲染
+    */
+    public function actionView()
+    {
+        $request = \Yii::$app->request->get();
+        $configAPi =new PrivateaccountApi();
+        $result = $configAPi->View($request);
+        return $this->renderPartial('view',[
+            'config' => $result['data'],
+        ]);
+    }
+
+
+    /**
+    * 添加新的邮箱
+    */
+    public function actionSave(){
+        $request = \Yii::$app->request->post();
+        $configsave = new PrivateaccountApi();
+        $result = $configsave->Save($request);   //保存配置
+        return $this->asJson($result);
+    }
+
+
+    //提交更新的邮箱数据
+    public function actionUpdatepage(){
+        $request = \Yii::$app->request->post();
+        $configAPi = new PrivateaccountApi();
+        $result = $configAPi->Updatepage($request);   //更新所有品种信息
+        return $this->asJson($result);
+    }
+
+}

normandcrm/admin/backend/modules/admin/views/common/_left.php

@@ -75,6 +75,7 @@ use yii\helpers\Url;
                     <li><a href=<?= Url::to(["/admin/deposit?type=1"]) ?>>成功入金明细</a></li>
                     <li><a href=<?= Url::to(["/admin/deposit-config"]) ?>>入金配置</a></li>
                     <li><a href=<?= Url::to(["/admin/publicaccount"]) ?>>对公配置</a></li>
+                    <li><a href=<?= Url::to(["/admin/privateaccount"]) ?>>对私配置</a></li>
                 </ul>
             </li>
 

normandcrm/admin/backend/modules/admin/views/privateaccount/add.php

@@ -0,0 +1,44 @@
+<div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+    <h4 class="modal-title">添加对私账户</h4>
+</div>
+<form id="form11" class="form-horizontal">
+    <div class="modal-body">
+        <div class="input-group">
+            <span class="input-group-addon">钱包地址</span>
+            <input name="account" type="text" class="form-control" placeholder="钱包地址">
+        </div>
+        <div class="hr-line-dashed"></div>
+        <div class="input-group">
+            <span>启用:</span>
+            <input name="is_close" type="radio" value="0"  style="margin-left:20px;">是
+            <input name="is_close" type="radio" value="1"  style="margin-left:20px;">否
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="button" class="btn btn-white" data-dismiss="modal">取消</button>
+        <button id="submit1" type="button" class="btn btn-primary">提交</button>
+    </div>
+</form>
+
+
+<script type="text/javascript">
+
+$("#submit1").on("click",function(){
+    $.ajax({
+        type: "POST",
+        url: "/admin/privateaccount/save",
+        data: $('#form11').serialize(),
+        dataType: "json",
+        success: function(response) {
+            if(response.code == 1){
+                $("#modal").modal("hide");
+                window.location.reload(); 
+            }else{
+                toastr.error(response.message, "提示");
+            }
+        }
+    });
+});
+
+</script>					

normandcrm/admin/backend/modules/admin/views/privateaccount/index.php

@@ -0,0 +1,161 @@
+
+<?php 
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2017/12/5/005 
+ * Time: 10:16
+ */
+?>
+<div class="row wrapper border-bottom white-bg page-heading">
+    <div class="col-lg-12">
+    <h2>系统设置</h2>
+        <ol class="breadcrumb">
+            <li>
+                <a href="<?= \yii\helpers\Url::to(['/admin/dashboard'])?>">管理首页</a>
+            </li>
+            <li class="active">
+                <strong>对私设置</strong>
+            </li>
+        </ol>
+    </div>
+</div>
+
+<div class="wrapper wrapper-content animated fadeInRight">
+    <button id="add" class="btn btn-default">添加新的对私账户</button>
+    <form id="form" class="form-horizontal">
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="ibox">
+                    <div class="ibox-title">
+                        <button class="btn btn-link">对私账户设置</button>
+                    </div>
+                    <div class="ibox-content">
+                    
+
+                        <table class="table table-bordered">
+                            <?php foreach ($config as $key => $row) :?>
+                                <tr>
+                                    <th <?php if($row['is_close'] == 1): ?>style="background: #eee;"<?php endif;?>>
+                                        <button onclick="viewpage(this)" type="button" class="btn btn-primary" style="float:right;" data-key="<?= $row['id'] ?>">修改当前配置</button>
+                                        <input name="<?= $row['id'] ?>" type="hidden"  value="<?= $key ?>">
+                                        <div class="div_padding">钱包地址:<?= $row['account'] ?></div>
+                                        <div class="div_padding">
+                                            <span>启用:</span>
+                                            <input type="radio" name="<?= $key ?>_is_close"  value="0"    <?php if($row['is_close'] == 0): ?>checked<?php endif;?> /> 开启
+                                            <input type="radio" name="<?= $key ?>_is_close"  value="1"    <?php if($row['is_close'] == 1): ?>checked<?php endif;?> /> 关闭
+                                        </div>
+                                        <div class="div_padding">添加时间:<?= date('Y-m-d H:m:s',$row['add_time'])?></div>
+                                    </th>
+                                </tr>
+                            <?php endforeach;?>
+                        </table>
+                      
+                    </div>
+                    <?php if($config==null){?>
+                        
+                    <?php }else{?>
+                        <div class="ibox-footer">
+                            <button id="submit" type="button" class="btn btn-primary"> 点我更新  ← 请谨慎设置</button>
+                        </div>
+                    <?php }?>
+                </div>
+            </div>
+
+        </div>
+    </form>
+</div>
+
+<?php $this->beginBlock('footer_script'); ?>
+<script>
+    KindEditor.ready(function(K) {});
+</script>
+
+
+<style>
+
+.div_padding{
+    padding: 10px;
+}
+
+</style>
+
+
+<!-- Page-Level Scripts -->
+<script>
+
+    //添加新品种页面
+    var table;
+    $(document).ready(function() {
+
+        table = $('#datatables').DataTable({});
+        $('#add').click(function() {
+            $("#modal").removeData();
+            var url="/admin/privateaccount/clear?t="+new Date().getTime();
+            $("#modal").modal({
+                remote:url,
+                show:true
+            }); 
+        });
+    });
+
+    //点击更新
+    $("#submit").on("click", function() {
+        $.ajax({
+            type: "POST",
+            url: "/admin/privateaccount/update",
+            data: $('#form').serialize(),
+            dataType: "json",
+            beforeSend: function() {},
+            success: function(data) {
+                if(data.code) {
+                    toastr.success(data.message, "提示");
+                    window.location.reload();
+                } else {
+                    toastr.error(data.message, "提示");
+                }
+            },
+            complete: function(XMLHttpRequest, textStatus) {},
+            error: function() {}
+        });
+    });
+
+
+    //点击删除
+    function delpage(that) {
+        console.log(11111);
+        var key = $(that).attr('data-key');
+        var data = {
+            key:key
+        };
+        $.ajax({
+            type: "POST",
+            url: "/admin/privateaccount/delpage",
+            data:data ,
+            dataType: "json",
+            beforeSend: function() {},
+            success: function(data) {
+                if(data.code) {
+                    toastr.success(data.message, "提示");
+                    window.location.reload();
+                } else {
+                    toastr.error(data.message, "提示");
+                }
+            },
+            complete: function(XMLHttpRequest, textStatus) {},
+            error: function() {}
+        });
+    }
+
+    function viewpage(that){
+            $("#modal").removeData();
+            var key = $(that).attr('data-key');  //获取展示的id
+            var url="/admin/privateaccount/view?id="+key+"&t="+new Date().getTime();
+            $("#modal").modal({
+                remote:url,
+                show:true
+            }); 
+        };
+
+</script>
+<?php $this->endBlock(); ?>

normandcrm/admin/backend/modules/admin/views/privateaccount/view.php

@@ -0,0 +1,46 @@
+<div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+    <h4 class="modal-title">查看对私账户</h4>
+</div>
+<form id="form11" class="form-horizontal">
+    <div class="modal-body">
+        <input name="id" type="hidden"  value="<?= $config['id'] ?>">
+        <div class="hr-line-dashed"></div>
+        <div class="input-group">
+            <span class="input-group-addon">钱包地址</span>
+            <input name="account" type="text" class="form-control"  value="<?= $config['account'] ?>" placeholder="钱包地址">
+        </div>
+        <div class="hr-line-dashed"></div>
+        <div class="input-group">
+            <span>启用:</span>
+            <input name="is_close" type="radio" value="0"  <?php if($config['is_close'] == 0): ?>checked<?php endif;?> style="margin-left:20px;">是
+            <input name="is_close" type="radio" value="1"  <?php if($config['is_close'] == 1): ?>checked<?php endif;?>  style="margin-left:20px;">否
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="button" class="btn btn-white" data-dismiss="modal">取消</button>
+        <button id="submit1" type="button" class="btn btn-primary">提交</button>
+    </div>
+</form>
+
+
+<script type="text/javascript">
+
+$("#submit1").on("click",function(){
+    $.ajax({
+        type: "POST",
+        url: "/admin/privateaccount/updatepage",
+        data: $('#form11').serialize(),
+        dataType: "json",
+        success: function(response) {
+            if(response.code == 1){
+                $("#modal").modal("hide");
+                window.location.reload(); 
+            }else{
+                toastr.error(response.message, "提示");
+            }
+        }
+    });
+});
+
+</script>					

normandcrm/crm/backend/modules/user/controllers/PayController.php

@@ -63,6 +63,7 @@ class PayController extends BaseController
             if ($data['payType'] == 19) {
                 $data['bankCode'] = isset($data['payplatBankCode']) ? trim($data['payplatBankCode']) : '';
             }
+
             $model->setAttributes($data);
             if ($model->outPay()) {
                 $result = $model->getOutPayResult();

normandcrm/service/backend/controllers/PrivateAccountController.php

@@ -0,0 +1,78 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: user
+ * Date: 2019/11/17
+ * Time: 14:38
+ */
+
+
+namespace backend\controllers;
+
+use backend\models\PrivateAccount;
+
+class PrivateAccountController extends BaseController
+{
+
+    /**
+     * 获取所有对私帐户信息
+     */
+    public function actionGetConfig()
+    {
+
+        $result =  PrivateAccount::find()->asArray()->all();
+        return $this->outJson(1, $result);
+    }
+
+    /**
+     * 获取单个对私帐户信息详情
+     */
+    public function actionView()
+    {
+        $request = \Yii::$app->request->get();
+        $id = isset($request['id']) ? (int)$request['id'] : '';
+        $result = PrivateAccount::find()->where(['id' => $id])->one();
+        return $this->outJson(1, $result);
+    }
+
+
+
+    /**
+     * 新增对私帐户
+     */
+    public function actionSave()
+    {
+        $request = \Yii::$app->request->post();
+        $params['account'] = isset($request['account']) ? $request['account'] : '';                               //钱包地址
+        $params['is_close'] = (int)$request['is_close'];                                              //是否启用
+        $params['add_time'] = time();
+        $obj = new PrivateAccount();
+        $obj->setAttributes($params);
+        if ($obj->save()) {
+            return $this->outJson(1, $obj->getAttributes());
+        } else {
+            return $this->outJson(0, [], $obj->getErrors());
+        }
+    }
+
+    /**
+     * 修改对私帐户
+     */
+    public function actionUpdatepage()
+    {
+        $request = \Yii::$app->request->post();
+        $params['account'] = isset($request['account']) ? $request['account'] : '';                               //钱包地址
+        $params['is_close'] = (int)$request['is_close'];                                              //是否启用
+
+        $result = PrivateAccount::updateAll([
+            'account'=> $params['account'],
+            'is_close'=> $params['is_close'],
+        ],
+            "id =".$request['id']);
+        if ($result) {
+            return $this->outJson(1, true);
+        } else {
+            return $this->outJson(0, [], "没有任何更新");
+        }
+    }
+}

normandcrm/service/backend/controllers/PublicAccountController.php

@@ -8,16 +8,6 @@
 
 namespace backend\controllers;
 
-use backend\helpers\DateTimeHelper;
-use backend\helpers\MailHelper;
-use backend\helpers\PaginationHelper;
-use backend\helpers\ValidatorHelper;
-use backend\models\Config;
-use backend\models\Mail;
-use backend\models\MailEvent;
-use backend\models\MailRecord;
-
-use backend\models\MailConfig;
 use backend\models\PublicAccount;
 
 class PublicAccountController extends BaseController

normandcrm/service/backend/models/PrivateAccount.php

@@ -0,0 +1,89 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: user
+ * Date: 2019/11/17
+ * Time: 14:38
+ */
+namespace backend\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "crm_private_account".
+ *
+ * @property integer $id
+ * @property integer $add_time
+ * @property integer $is_close
+ * @property integer $is_used
+ * @property string $account
+ */
+class PrivateAccount extends \yii\db\ActiveRecord
+{
+
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'crm_private_account';
+    }
+
+    /**
+     * @return \yii\db\Connection the database connection used by this AR class.
+     */
+    public static function getDb()
+    {
+        return Yii::$app->get('dbXcrm');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id', 'add_time','is_close','is_used'], 'number'],
+            [['account'], 'string'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id' => 'id',
+            'add_time' => 'add_time',
+            'is_close' => 'is_close',
+            'is_used' => 'is_used',
+            'account' => 'account',
+        ];
+    }
+
+    /**
+     * @return array|bool|\yii\db\ActiveRecord[]
+     */
+    public static function getAccountConfig()
+    {
+        $sql = "select id from crm_private_account where is_close = 0";
+        $res = static::findBySql($sql)->asArray()->all();
+        if(empty($res)){
+            return false;//没有开放的对私帐户
+        }
+        $sql = "select id,account from crm_private_account where is_close = 0 and is_used = 0 order by id desc limit 1";
+        $account_arr = static::findBySql($sql)->asArray()->all();
+        if($account_arr[0]['id']){
+            return $account_arr[0];
+        }else{
+            static::updateAll(['is_used' => 0],['is_used' => 1,'is_close' => 0]);
+            $sql = "select id,account from crm_private_account where is_close = 0 and is_used = 0 order by id desc limit 1";
+            $account_arr = static::findBySql($sql)->asArray()->all();
+            if($account_arr[0]['id']){
+                file_put_contents('test.txt',json_encode($account_arr[0]));
+                return $account_arr[0];
+            }
+        }
+    }
+}

normandcrm/service/backend/models/PublicAccount.php

@@ -52,14 +52,20 @@ class PublicAccount extends \yii\db\ActiveRecord
         if(empty($res)){
             return false;//没有开放的对公帐户
         }
-        $sql = "select account,bank,name from crm_public_account where is_close = 0 and is_used = 0 order by id desc limit 1";
+        $sql = "select id,account,bank,name from crm_public_account where is_close = 0 and is_used = 0 order by id desc limit 1";
         $account_arr = static::findBySql($sql)->asArray()->all();
         if($account_arr){
             return $account_arr[0];
         }else{
-            $sql = "update crm_public_account set is_used = 1 where is_close = 1";
-            Yii::$app->db->createCommand($sql)->execute();
-            static::getAccountConfig();
+            static::updateAll(['is_used' => 0],['is_used' => 1,'is_close' => 0]);
+            $sql = "select id,account,bank,name from crm_public_account where is_close = 0 and is_used = 0 order by id desc limit 1";
+            $account_arr = static::findBySql($sql)->asArray()->all();
+            if($account_arr){
+                $id = $account_arr[0]['id'];
+                $sql = "update crm_public_account set is_used = 1 where id = $id";
+                Yii::$app->db->createCommand($sql)->execute();
+                return $account_arr[0];
+            }
         }
     }
 }

normandcrm/service/common/pay/duigong/PayHandler.php

@@ -42,10 +42,18 @@ class PayHandler extends BasePayHandler
         $money = sprintf("%.2f",$deposit['rmb']);
         $PublicAccount = new PublicAccount();
         $result = $PublicAccount->getAccountConfig();
-        $result_account = $result['account'];     // 卡号
-        $result_name = $result['name'];           // 收款姓名
-        $result_bank = $result['bank'];           // 收款开户行
-        return PayHandler::createGetHtml($money,$result_account,$result_name,$result_bank);
+        if($result['id']){
+            PublicAccount::updateAll([
+                'is_used'=> 1,
+            ], "id =".$result['id']);
+            $result_account = $result['account'];     // 卡号
+            $result_name = $result['name'];           // 收款姓名
+            $result_bank = $result['bank'];           // 收款开户行
+            return PayHandler::createGetHtml($money,$result_account,$result_name,$result_bank);
+        }else{
+            return '该通道已关闭';
+        }
+
     }
 
     /**

normandcrm/service/common/pay/duisi/PayHandler.php

@@ -5,6 +5,7 @@ namespace common\pay\duisi;
 use backend\models\Config;
 use backend\models\Deposit;
 use backend\models\SyncDesposit;
+use backend\models\PrivateAccount;
 use common\pay\BasePayHandler;
 use Yii;
 use yii\helpers\VarDumper;
@@ -37,9 +38,18 @@ class PayHandler extends BasePayHandler
      */
     public function outPay($deposit, $params = [])
     {
-        $data = [];
         $money = sprintf("%.2f",$deposit['amount']);
-        return PayHandler::createGetHtml($money);
+        $account = PrivateAccount::getAccountConfig();
+        if($account['id']){
+            PrivateAccount::updateAll([
+                'is_used'=> 1,
+            ],
+                "id =".$account['id']);
+            return PayHandler::createGetHtml($money,$account['account']);
+        }else{
+           return "通道已经关闭";
+        }
+
     }
 
     /**
@@ -70,7 +80,7 @@ class PayHandler extends BasePayHandler
                             $syncDespositModel->in_time = time();
                             $syncDespositModel->save();
                         }
-                        return success;
+                        return true;
                     }
                 }
             }
@@ -103,7 +113,7 @@ class PayHandler extends BasePayHandler
                     $merOrderId = trim($data['orderNo']);
                     $reuslt = Deposit::find()->where(['order_sn' => $merOrderId])->asArray()->limit(1)->one();
                     if ($reuslt) {
-                        return success;
+                        return true;
                     }
                 }
             }
@@ -118,25 +128,24 @@ class PayHandler extends BasePayHandler
 
 
         // 生成html模板文件
-    public static function createGetHtml($money)
+    public static function createGetHtml($money,$account)
     {
         $html = <<<eot
         <div style="border: 1px solid green;width:800px;height: 500px;margin:10% auto;text-align: center;border-radius:30px;padding-top:70px; ">
         <p>请转账到如下账户</p>
         <p>订单金额为：<span style="color:red;">{$money}</span></p>
         <span style="color:red;" id="address2"></span>
-        <p>USDT钱包地址：0xAEc30e013d4d701363402dbc6B2b6C96257A4a39</p>
+        <p>USDT钱包地址:{$account}</p>
         <p>请使用USDT钱包扫码转帐</p>
         </div>
         <script src="/ui/js/jquery.1.9.1.min.js"></script>
         <script src="/ui/js/jquery-qrcode-0.14.0.min.js"></script>
         <script>
-            
             $('#address2').qrcode({
                 render: "canvas", 
-                width: 100,
-                height: 100,
-                text: "0xAEc30e013d4d701363402dbc6B2b6C96257A4a39"
+                width: 200,
+                height: 200,
+                text: "{$account}"
             });
         </script>
 eot;

normandmkt_crm.sql

@@ -11,7 +11,7 @@
  Target Server Version : 50553
  File Encoding         : 65001
 
- Date: 25/10/2019 14:38:07
+ Date: 17/11/2019 17:03:51
 */
 
 SET NAMES utf8mb4;
@@ -181,8 +181,84 @@ CREATE TABLE `crm_deposit`  (
   `login` int(11) NOT NULL COMMENT '登录ID',
   `mt4_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'MT4入金状态',
   `admin_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '操作人',
+  `recharge_id` int(11) NOT NULL DEFAULT 0 COMMENT '充值记录id',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 13239 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '入金明细表' ROW_FORMAT = Compact;
+) ENGINE = InnoDB AUTO_INCREMENT = 13310 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '入金明细表' ROW_FORMAT = Compact;
+
+-- ----------------------------
+-- Records of crm_deposit
+-- ----------------------------
+INSERT INTO `crm_deposit` VALUES (13239, 0, '201911170735099793', 84560, 100.61, 688.17, 6.840, NULL, 2018081668, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13240, 0, '201911170735323195', 84560, 100.04, 684.27, 6.840, NULL, 2018103972, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13241, 0, '201911170735421776', 84560, 100.38, 686.60, 6.840, NULL, 2018113954, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13242, 0, '201911170737519438', 84560, 100.40, 686.74, 6.840, NULL, 2018243591, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13243, 0, '201911170738049840', 84560, 100.48, 687.28, 6.840, NULL, 2018256849, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13244, 0, '201911170738552863', 84560, 100.69, 688.72, 6.840, NULL, 2018307438, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13245, 0, '201911170739481615', 84560, 100.26, 685.78, 6.840, NULL, 2018360716, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13246, 0, '201911170741541684', 84560, 100.46, 687.15, 6.840, NULL, 2018486698, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13247, 0, '201911170743104627', 84560, 100.61, 688.17, 6.840, NULL, 2018562163, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13248, 0, '201911170744043244', 84560, 100.46, 687.15, 6.840, NULL, 2018616820, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13249, 0, '201911170745197117', 84560, 100.02, 684.14, 6.840, NULL, 2018691207, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13250, 0, '201911170745442565', 84560, 100.16, 685.09, 6.840, NULL, 2018716705, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13251, 0, '201911170751232135', 84560, 100.46, 687.15, 6.840, NULL, 2019055142, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13252, 0, '201911170754365590', 84560, 100.19, 685.30, 6.840, NULL, 2019248053, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13253, 0, '201911170755465590', 84560, 100.05, 684.34, 6.840, NULL, 2019318194, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13254, 0, '201911170756329922', 84560, 100.51, 687.49, 6.840, NULL, 2019363990, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13255, 0, '201911170756459394', 84560, 100.50, 687.42, 6.840, NULL, 2019377371, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13256, 0, '201911170800462997', 84560, 100.11, 684.75, 6.840, NULL, 2019618174, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13257, 0, '201911170802117932', 84560, 100.62, 688.24, 6.840, NULL, 2019703458, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13258, 0, '201911170803571600', 84560, 100.09, 684.62, 6.840, NULL, 2019808883, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13259, 0, '201911170805351416', 84560, 100.53, 687.63, 6.840, NULL, 2019907646, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13260, 0, '201911170805582574', 84560, 100.69, 688.72, 6.840, NULL, 2019930426, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13261, 0, '201911170806502188', 84560, 100.47, 687.21, 6.840, NULL, 2019982090, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13262, 0, '201911170810159118', 84560, 100.25, 685.71, 6.840, NULL, 2020187559, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13263, 0, '201911170811172154', 84560, 100.57, 687.90, 6.840, NULL, 2020249351, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13264, 0, '201911170812434475', 84560, 100.45, 687.08, 6.840, NULL, 2020335581, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13265, 0, '201911170813505691', 84560, 100.53, 687.63, 6.840, NULL, 2020402786, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13266, 0, '201911170814226532', 84560, 100.26, 685.78, 6.840, NULL, 2020434323, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13267, 0, '201911170815202575', 84560, 100.60, 688.10, 6.840, NULL, 2020492585, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13268, 0, '201911170815429703', 84560, 100.51, 687.49, 6.840, NULL, 2020513884, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13269, 0, '201911170817502446', 84560, 100.39, 686.67, 6.840, NULL, 2020641963, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13270, 0, '201911170819268713', 84560, 100.39, 686.67, 6.840, NULL, 2020738556, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13271, 0, '201911170820125987', 84560, 100.56, 687.83, 6.840, NULL, 2020783845, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13272, 0, '201911170820411496', 84560, 100.50, 687.42, 6.840, NULL, 2020813420, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13273, 0, '201911170821073147', 84560, 100.64, 688.38, 6.840, NULL, 2020839313, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13274, 0, '201911170823316547', 84560, 100.19, 685.30, 6.840, NULL, 2020982956, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13275, 0, '201911170823446085', 84560, 100.07, 684.48, 6.840, NULL, 2020995991, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13276, 0, '201911170825135512', 84560, 100.21, 685.44, 6.840, NULL, 2021084967, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13277, 0, '201911170825293710', 84560, 100.16, 685.09, 6.840, NULL, 2021101046, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13278, 0, '201911170826348328', 84560, 100.46, 687.15, 6.840, NULL, 2021166655, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13279, 0, '201911170830003427', 84560, 100.34, 686.33, 6.840, NULL, 2021372765, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13280, 0, '201911170830262175', 84560, 100.14, 684.96, 6.840, NULL, 2021398429, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13281, 0, '201911170831059075', 84560, 100.66, 688.51, 6.840, NULL, 2021437612, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13282, 0, '201911170831181655', 84560, 100.43, 686.94, 6.840, NULL, 2021450313, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13283, 0, '201911170834593455', 84560, 100.37, 686.53, 6.840, NULL, 2021670904, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13284, 0, '201911170835359275', 84560, 100.62, 688.24, 6.840, NULL, 2021707211, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13285, 0, '201911170835421987', 84560, 100.06, 684.41, 6.840, NULL, 2021714434, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13286, 0, '201911170835496041', 84560, 100.69, 688.72, 6.840, NULL, 2021720952, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13287, 0, '201911170838414668', 84560, 100.35, 686.39, 6.840, NULL, 2021893457, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13288, 0, '201911170838559510', 84560, 100.53, 687.63, 6.840, NULL, 2021907106, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13289, 0, '201911170839135278', 84560, 100.43, 686.94, 6.840, NULL, 2021925711, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13290, 0, '201911170840067840', 84560, 100.20, 685.37, 6.840, NULL, 2021978070, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13291, 0, '201911170840237789', 84560, 100.52, 687.56, 6.840, NULL, 2021994917, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13292, 0, '201911170840336739', 84560, 100.55, 687.76, 6.840, NULL, 2022005412, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13293, 0, '201911170842318783', 84560, 100.41, 686.80, 6.840, NULL, 2022123501, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13294, 0, '201911170842457623', 84560, 100.14, 684.96, 6.840, NULL, 2022136958, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13295, 0, '201911170842528528', 84560, 100.64, 688.38, 6.840, NULL, 2022144667, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13296, 0, '201911170844175912', 84560, 100.19, 685.30, 6.840, NULL, 2022229797, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13297, 0, '201911170847328752', 84560, 100.53, 687.63, 6.840, NULL, 2022424626, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13298, 0, '201911170851437594', 84560, 100.43, 686.94, 6.840, NULL, 2022675618, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13299, 0, '201911170853198855', 84560, 100.70, 688.79, 6.840, NULL, 2022771573, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13300, 0, '201911170853307874', 84560, 100.26, 685.78, 6.840, NULL, 2022782064, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13301, 0, '201911170853365382', 84560, 100.09, 684.62, 6.840, NULL, 2022788747, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13302, 0, '201911170853587900', 84560, 100.05, 684.34, 6.840, NULL, 2022810619, '对私支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13303, 0, '201911170859503239', 84560, 100.32, 686.19, 6.840, NULL, 2023162699, '对公支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13304, 0, '201911170900309903', 84560, 100.16, 685.09, 6.840, NULL, 2023202049, '对公支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13305, 0, '201911170901301272', 84560, 100.18, 685.23, 6.840, NULL, 2023262805, '对公支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13306, 0, '201911170901545431', 84560, 100.22, 685.50, 6.840, NULL, 2023286121, '对公支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13307, 0, '201911170902011187', 84560, 100.14, 684.96, 6.840, NULL, 2023293844, '对公支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13308, 0, '201911170902085651', 84560, 100.28, 685.92, 6.840, NULL, 2023299953, '对公支付', 601, 0, '', 0);
+INSERT INTO `crm_deposit` VALUES (13309, 0, '201911170902258599', 84560, 100.26, 685.78, 6.840, NULL, 2023316984, '对公支付', 601, 0, '', 0);
 
 -- ----------------------------
 -- Table structure for crm_deposit_config
@@ -197,7 +273,7 @@ CREATE TABLE `crm_deposit_config`  (
 -- ----------------------------
 -- Records of crm_deposit_config
 -- ----------------------------
-INSERT INTO `crm_deposit_config` VALUES (1, '{\"9\":{\"id\":9,\"label\":\"创汇支付\",\"enable\":1},\"10\":{\"id\":10,\"label\":\"OTC支付\",\"enable\":0},\"11\":{\"id\":11,\"label\":\"银联支付A\",\"enable\":0},\"12\":{\"id\":12,\"label\":\"银联支付B\",\"enable\":0},\"13\":{\"id\":13,\"label\":\"银联支付C\",\"enable\":0},\"14\":{\"id\":14,\"label\":\"捷登支付A\",\"enable\":1}}');
+INSERT INTO `crm_deposit_config` VALUES (1, '{\"10\":{\"id\":10,\"label\":\"OTC支付\",\"enable\":0},\"11\":{\"id\":11,\"label\":\"银联支付A\",\"enable\":0},\"12\":{\"id\":12,\"label\":\"银联支付B\",\"enable\":0},\"13\":{\"id\":13,\"label\":\"银联支付C\",\"enable\":0},\"14\":{\"id\":14,\"label\":\"JD通道A\",\"enable\":0},\"15\":{\"id\":15,\"label\":\"eagle\",\"enable\":0},\"16\":{\"id\":16,\"label\":\"对私支付\",\"enable\":1},\"17\":{\"id\":17,\"label\":\"对公支付\",\"enable\":1},\"18\":{\"id\":18,\"label\":\"globalpay\",\"enable\":0},\"19\":{\"id\":19,\"label\":\"payplat支付\",\"enable\":0}}');
 
 -- ----------------------------
 -- Table structure for crm_ib_open_record
@@ -347,6 +423,7 @@ CREATE TABLE `crm_member`  (
   `ib_old_login_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'old_ib登录账户',
   `group_sn` int(6) NOT NULL DEFAULT 1 COMMENT 'MT4开户编号',
   `is_delete` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除 0 否 1 是',
+  `address1` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'USDT钱包地址',
   PRIMARY KEY (`id`) USING BTREE,
   INDEX `INDEX_REF_ID`(`ref_id`) USING BTREE,
   INDEX `INDEX_REF_PATH`(`ref_path`(255)) USING BTREE
@@ -355,14 +432,14 @@ CREATE TABLE `crm_member`  (
 -- ----------------------------
 -- Records of crm_member
 -- ----------------------------
-INSERT INTO `crm_member` VALUES (1, 99, 1, 'admin', 'e10adc3949ba59abbe56e057f20f883e', '61.6.94.14', NULL, '管理员', NULL, NULL, NULL, NULL, '13800138000', NULL, NULL, NULL, '/upload/avatar-2.jpg', NULL, NULL, 1513848070669, NULL, 1, 1);
-INSERT INTO `crm_member` VALUES (6, 2, 1, '13809664911@139.com', 'e10adc3949ba59abbe56e057f20f883e', '119.123.124.59', '600', '李志朋', 1, NULL, '2015-01-06 00:00:00', '广东惠州', '', '624262', NULL, NULL, NULL, 75, '70,75,', 1422076704000, 'wcs1411', 1, 1);
-INSERT INTO `crm_member` VALUES (84555, 99, 1, 'admin-01', 'e10adc3949ba59abbe56e057f20f883e', '171.6.242.41', NULL, '客服主管', 0, NULL, NULL, NULL, '13600000000', NULL, NULL, NULL, NULL, NULL, NULL, 1562242561039, NULL, 1, 0);
-INSERT INTO `crm_member` VALUES (84556, 99, 1, 'admin-02', 'e10adc3949ba59abbe56e057f20f883e', '110.168.249.76', NULL, '客服', 0, NULL, NULL, NULL, '13200000000', NULL, NULL, NULL, NULL, NULL, NULL, 1562242816893, NULL, 1, 0);
-INSERT INTO `crm_member` VALUES (84557, 99, 1, 'admin-03', 'e10adc3949ba59abbe56e057f20f883e', '110.168.249.76', NULL, '客服', 0, NULL, NULL, NULL, '13500000000', NULL, NULL, NULL, NULL, NULL, NULL, 1562242846718, NULL, 1, 0);
-INSERT INTO `crm_member` VALUES (84558, 99, 1, 'admin-04', 'e10adc3949ba59abbe56e057f20f883e', '110.168.249.76', NULL, '客服', 0, NULL, NULL, NULL, '13800000000', NULL, NULL, NULL, NULL, NULL, NULL, 1562242878119, NULL, 1, 0);
-INSERT INTO `crm_member` VALUES (84559, 99, 1, 'admin-05', 'e10adc3949ba59abbe56e057f20f883e', '110.168.249.76', NULL, '财务', 0, NULL, NULL, NULL, '13900000000', NULL, NULL, NULL, NULL, NULL, NULL, 1562242921970, NULL, 1, 0);
-INSERT INTO `crm_member` VALUES (84560, 2, 1, '2647872640@qq.com', 'e10adc3949ba59abbe56e057f20f883e', '110.168.249.76', '601', '金铭', 0, '', NULL, '', NULL, '601', NULL, NULL, NULL, 6, '70,75,6,', 1562243548781, 'normandm-01', 1, 0);
+INSERT INTO `crm_member` VALUES (1, 99, 1, 'admin', 'e10adc3949ba59abbe56e057f20f883e', '61.6.94.14', NULL, '管理员', NULL, NULL, NULL, NULL, '13800138000', NULL, NULL, NULL, '/upload/avatar-2.jpg', NULL, NULL, 1513848070669, NULL, 1, 1, '');
+INSERT INTO `crm_member` VALUES (6, 2, 1, '13809664911@139.com', 'e10adc3949ba59abbe56e057f20f883e', '119.123.124.59', '600', '李志朋', 1, NULL, '2015-01-06 00:00:00', '广东惠州', '', '624262', NULL, NULL, NULL, 75, '70,75,', 1422076704000, 'wcs1411', 1, 1, '');
+INSERT INTO `crm_member` VALUES (84555, 99, 1, 'admin-01', 'e10adc3949ba59abbe56e057f20f883e', '171.6.242.41', NULL, '客服主管', 0, NULL, NULL, NULL, '13600000000', NULL, NULL, NULL, NULL, NULL, NULL, 1562242561039, NULL, 1, 0, '');
+INSERT INTO `crm_member` VALUES (84556, 99, 1, 'admin-02', 'e10adc3949ba59abbe56e057f20f883e', '110.168.249.76', NULL, '客服', 0, NULL, NULL, NULL, '13200000000', NULL, NULL, NULL, NULL, NULL, NULL, 1562242816893, NULL, 1, 0, '');
+INSERT INTO `crm_member` VALUES (84557, 99, 1, 'admin-03', 'e10adc3949ba59abbe56e057f20f883e', '110.168.249.76', NULL, '客服', 0, NULL, NULL, NULL, '13500000000', NULL, NULL, NULL, NULL, NULL, NULL, 1562242846718, NULL, 1, 0, '');
+INSERT INTO `crm_member` VALUES (84558, 99, 1, 'admin-04', 'e10adc3949ba59abbe56e057f20f883e', '110.168.249.76', NULL, '客服', 0, NULL, NULL, NULL, '13800000000', NULL, NULL, NULL, NULL, NULL, NULL, 1562242878119, NULL, 1, 0, '');
+INSERT INTO `crm_member` VALUES (84559, 99, 1, 'admin-05', 'e10adc3949ba59abbe56e057f20f883e', '110.168.249.76', NULL, '财务', 0, NULL, NULL, NULL, '13900000000', NULL, NULL, NULL, NULL, NULL, NULL, 1562242921970, NULL, 1, 0, '');
+INSERT INTO `crm_member` VALUES (84560, 1, 1, '2647872640@qq.com', 'e10adc3949ba59abbe56e057f20f883e', '127.0.0.1', '601', '金铭', 0, '', NULL, '', NULL, '601', NULL, NULL, NULL, 6, '70,75,6,', 1562243548781, 'normandm-01', 1, 0, '');
 
 -- ----------------------------
 -- Table structure for crm_member_bank_info
@@ -506,7 +583,7 @@ CREATE TABLE `crm_permission`  (
 -- ----------------------------
 -- Records of crm_permission
 -- ----------------------------
-INSERT INTO `crm_permission` VALUES (1, 1, '/admin/dashboard,/admin/password,/admin/kindeditor,/admin/member,/admin/user,/admin/open,/admin/modify-lever,/admin/transfer,/admin/notice,/admin/admin,/admin/ib,/admin/trades,/admin/deposit,/admin/deposit-config,/admin/ssac-deposit,/admin/withdraw,/admin/ssac-withdraw,/admin/finance-remit,/admin/remit,/admin/logs,/admin/config,/admin/mt4,/admin/mail,/admin/activity,/admin/mailconfig,/admin/mail/statistics,');
+INSERT INTO `crm_permission` VALUES (1, 1, '/admin/dashboard,/admin/password,/admin/kindeditor,/admin/member,/admin/user,/admin/open,/admin/modify-lever,/admin/transfer,/admin/notice,/admin/admin,/admin/ib,/admin/trades,/admin/deposit,/admin/deposit-config,/admin/ssac-deposit,/admin/withdraw,/admin/ssac-withdraw,/admin/finance-remit,/admin/remit,/admin/logs,/admin/config,/admin/mt4,/admin/mail,/admin/activity,/admin/mailconfig,/admin/mail/statistics,/admin/privateaccount,/admin/publicaccount,');
 INSERT INTO `crm_permission` VALUES (4, 81969, '/admin/dashboard,/admin/password,/admin/kindeditor,/admin/member,/admin/user,/admin/open,/admin/modifyLever,/admin/transfer,/admin/notice,/admin/ib,/admin/deposit,/admin/withdraw,/admin/mail,');
 INSERT INTO `crm_permission` VALUES (5, 81970, '/admin/dashboard,/admin/password,/admin/kindeditor,/admin/member,/admin/user,/admin/open,/admin/modifyLever,/admin/transfer,/admin/notice,/admin/ib,/admin/deposit,/admin/withdraw,/admin/mail,');
 INSERT INTO `crm_permission` VALUES (6, 81971, '/admin/dashboard,/admin/password,/admin/kindeditor,/admin/member,/admin/user,/admin/open,/admin/modifyLever,/admin/transfer,/admin/ib,/admin/deposit,/admin/withdraw,/admin/mail,');
@@ -547,6 +624,34 @@ INSERT INTO `crm_permission` VALUES (40, 84557, '/admin/dashboard,/admin/member,
 INSERT INTO `crm_permission` VALUES (41, 84558, '/admin/dashboard,/admin/member,/admin/user,/admin/open,/admin/ib,/admin/trades,/admin/deposit,/admin/withdraw,/admin/mail,');
 INSERT INTO `crm_permission` VALUES (42, 84559, '/admin/dashboard,/admin/member,/admin/user,/admin/open,/admin/ib,/admin/trades,/admin/deposit,/admin/withdraw,/admin/mail,');
 
+-- ----------------------------
+-- Table structure for crm_private_account
+-- ----------------------------
+DROP TABLE IF EXISTS `crm_private_account`;
+CREATE TABLE `crm_private_account`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `account` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '钱包地址',
+  `is_close` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否关闭，0-启用，1-关闭',
+  `is_used` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否使用过，0-未使用过，1-使用过',
+  `add_time` int(11) NOT NULL DEFAULT 0 COMMENT '添加时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = MyISAM AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for crm_public_account
+-- ----------------------------
+DROP TABLE IF EXISTS `crm_public_account`;
+CREATE TABLE `crm_public_account`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `account` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '帐号',
+  `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '开户人',
+  `bank` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '开户行',
+  `is_close` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否关闭，0开放，1关闭',
+  `is_used` tinyint(1) NOT NULL DEFAULT 0 COMMENT '当前循环中，是否被使用过，0未使用过，1使用过',
+  `add_time` int(11) NOT NULL DEFAULT 0 COMMENT '添加对公帐户的时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
+
 -- ----------------------------
 -- Table structure for crm_remit_log
 -- ----------------------------
@@ -622,7 +727,7 @@ CREATE TABLE `crm_signin`  (
   `memo` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
   `in_time` bigint(20) NOT NULL COMMENT '创建时间',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 20 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '用户登录表' ROW_FORMAT = Compact;
+) ENGINE = InnoDB AUTO_INCREMENT = 22 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '用户登录表' ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Records of crm_signin
@@ -646,6 +751,8 @@ INSERT INTO `crm_signin` VALUES (16, 1, '61.6.94.14', NULL, 1562336158530);
 INSERT INTO `crm_signin` VALUES (17, 84555, '171.6.242.41', NULL, 1562484658118);
 INSERT INTO `crm_signin` VALUES (18, 84555, '171.6.242.41', NULL, 1562511449641);
 INSERT INTO `crm_signin` VALUES (19, 1, '61.6.94.14', NULL, 1562549068348);
+INSERT INTO `crm_signin` VALUES (20, 84560, '127.0.0.1', NULL, 1573975628695);
+INSERT INTO `crm_signin` VALUES (21, 84560, '127.0.0.1', NULL, 1573975818191);
 
 -- ----------------------------
 -- Table structure for crm_sync_desposit
@@ -764,39 +871,6 @@ CREATE TABLE `mt4_prices`  (
   PRIMARY KEY (`SYMBOL`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
 
--- ----------------------------
--- Records of mt4_prices
--- ----------------------------
-INSERT INTO `mt4_prices` VALUES ('AUDUSD', '2019-07-08 03:08:42', 0.6981, 0.6986, 0.69762, 0.69844, 1, 5, 50, '2019-07-08 02:08:52');
-INSERT INTO `mt4_prices` VALUES ('BTCUSD', '2019-07-08 03:08:50', 11423.49, 11443.49, 11378.74, 11544.24, 1, 2, 2000, '2019-07-08 02:08:52');
-INSERT INTO `mt4_prices` VALUES ('CHA.50', '2019-07-08 03:08:52', 13576.3, 13581.3, 13548.8, 13691.3, 0, 1, 50, '2019-07-08 02:08:52');
-INSERT INTO `mt4_prices` VALUES ('CHA50', '2019-07-08 03:08:52', 13576.3, 13581.3, 13548.8, 13691.3, 0, 1, 50, '2019-07-08 02:08:52');
-INSERT INTO `mt4_prices` VALUES ('CHA50.', '2019-07-08 03:08:52', 13576.3, 13581.3, 13548.8, 13691.3, 0, 1, 50, '2019-07-08 02:08:52');
-INSERT INTO `mt4_prices` VALUES ('ETHUSD', '2019-07-08 03:08:48', 303.74, 306.74, 300.76, 307.17, 1, 2, 300, '2019-07-08 02:08:52');
-INSERT INTO `mt4_prices` VALUES ('EURUSD', '2019-07-08 03:08:49', 1.12242, 1.12292, 1.12178, 1.12277, 0, 5, 50, '2019-07-08 02:08:52');
-INSERT INTO `mt4_prices` VALUES ('FRA.40', '2019-07-05 20:59:59', 5598.64, 5603.64, 5570.73, 5620.47, 0, 2, 500, '2019-07-05 20:00:15');
-INSERT INTO `mt4_prices` VALUES ('GBPUSD', '2019-07-08 03:08:44', 1.2522199999999999, 1.25272, 1.25208, 1.25286, 0, 5, 50, '2019-07-08 02:08:52');
-INSERT INTO `mt4_prices` VALUES ('GER.30', '2019-07-05 20:59:58', 12575.21, 12580.21, 12517.6, 12639.78, 0, 2, 500, '2019-07-05 20:00:15');
-INSERT INTO `mt4_prices` VALUES ('HKG.33', '2019-07-08 03:08:52', 28347.5, 28387.5, 28245.1, 28556, 0, 2, 4000, '2019-07-08 02:08:52');
-INSERT INTO `mt4_prices` VALUES ('HKI.50', '2019-07-08 03:08:52', 28366, 28369, 28263.6, 28574.5, 0, 2, 300, '2019-07-08 02:08:52');
-INSERT INTO `mt4_prices` VALUES ('HKI50', '2019-07-08 03:08:52', 28347.5, 28387.5, 28245.1, 28560.7, 0, 2, 4000, '2019-07-08 02:08:52');
-INSERT INTO `mt4_prices` VALUES ('LTCUSD', '2019-07-08 03:08:35', 118.97, 119.97, 118.75, 120.3, 1, 2, 100, '2019-07-08 02:08:52');
-INSERT INTO `mt4_prices` VALUES ('MSCI', '2019-07-08 03:08:52', 23475.9, 23480.9, 23434.7, 23648.4, 0, 1, 50, '2019-07-08 02:08:52');
-INSERT INTO `mt4_prices` VALUES ('MSCI.CN', '2019-07-08 03:08:52', 23475.9, 23480.9, 23434.7, 23648.4, 0, 1, 50, '2019-07-08 02:08:52');
-INSERT INTO `mt4_prices` VALUES ('NAS100', '2019-07-08 03:08:49', 7831.63, 7836.63, 7827.38, 7854.5, 1, 2, 500, '2019-07-08 02:08:52');
-INSERT INTO `mt4_prices` VALUES ('NZDUSD', '2019-07-08 03:08:47', 0.66318, 0.66368, 0.66247, 0.66347, 1, 5, 50, '2019-07-08 02:08:52');
-INSERT INTO `mt4_prices` VALUES ('OILUSD', '2019-07-08 03:08:14', 57.71, 57.76, 57.59, 57.81, 0, 2, 5, '2019-07-08 02:08:22');
-INSERT INTO `mt4_prices` VALUES ('SPX500', '2019-07-08 03:08:48', 2984.13, 2989.13, 2982.88, 2990.13, 1, 2, 500, '2019-07-08 02:08:52');
-INSERT INTO `mt4_prices` VALUES ('UK.100', '2019-07-05 20:59:58', 7566.71, 7571.71, 7538.65, 7601.04, 0, 2, 500, '2019-07-05 20:00:15');
-INSERT INTO `mt4_prices` VALUES ('USA.30', '2019-07-08 03:08:48', 26843.5, 26848.5, 26829.5, 26896.5, 1, 2, 500, '2019-07-08 02:08:52');
-INSERT INTO `mt4_prices` VALUES ('USDCAD', '2019-07-08 03:08:30', 1.30717, 1.3076699999999999, 1.30687, 1.30792, 0, 5, 50, '2019-07-08 02:08:52');
-INSERT INTO `mt4_prices` VALUES ('USDCHF', '2019-07-08 03:08:34', 0.99075, 0.99125, 0.99045, 0.99129, 0, 5, 50, '2019-07-08 02:08:52');
-INSERT INTO `mt4_prices` VALUES ('USDCNH', '2019-07-08 03:08:50', 6.89285, 6.89785, 6.88935, 6.89674, 1, 5, 500, '2019-07-08 02:08:52');
-INSERT INTO `mt4_prices` VALUES ('USDHKD', '2019-07-08 03:08:22', 7.79433, 7.79933, 7.79293, 7.79759, 0, 5, 500, '2019-07-08 02:08:22');
-INSERT INTO `mt4_prices` VALUES ('USDJPY', '2019-07-08 03:08:50', 108.453, 108.503, 108.38, 108.538, 1, 3, 50, '2019-07-08 02:08:52');
-INSERT INTO `mt4_prices` VALUES ('XAGUSD', '2019-07-08 03:08:45', 14.991, 15.041, 14.945, 14.997, 0, 3, 50, '2019-07-08 02:08:52');
-INSERT INTO `mt4_prices` VALUES ('XAUUSD', '2019-07-08 03:08:48', 1398.08, 1398.58, 1394.32, 1400.07, 0, 2, 50, '2019-07-08 02:08:52');
-
 -- ----------------------------
 -- Table structure for mt4_trades
 -- ----------------------------
@@ -840,25 +914,6 @@ CREATE TABLE `mt4_trades`  (
   INDEX `INDEX_STAMP`(`TIMESTAMP`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
 
--- ----------------------------
--- Records of mt4_trades
--- ----------------------------
-INSERT INTO `mt4_trades` VALUES (1, 80000000, '', 0, 6, 1, '2019-07-02 07:56:26', 0, 0, 0, '2019-07-02 07:56:26', '1970-01-01 00:00:00', 0, 0, 0, 0, 0, 0, 0, 500000, 0, 'wire', 0, 0, 1562054186, 0, 0, 0, 0, '2019-07-02 06:56:27');
-INSERT INTO `mt4_trades` VALUES (2, 80000000, 'OILUSD', 2, 0, 100, '2019-07-02 08:00:43', 59.35, 0, 0, '2019-07-03 04:01:12', '1970-01-01 00:00:00', 0, 59.35, 56.6, -50, 0, -12, 56.6, -2750, 0, '', 0, 1, 1562126472, 0, 0, 0, 0, '2019-07-03 03:01:12');
-INSERT INTO `mt4_trades` VALUES (3, 80000000, 'CHA50', 1, 1, 100, '2019-07-02 08:00:48', 13878.8, 0, 0, '2019-07-03 04:01:13', '1970-01-01 00:00:00', 0, 1, 1, -50, 0, -12, 13831.3, 475, 0, '', 0, 1, 1562126473, 0, 0, 0, 0, '2019-07-03 03:01:13');
-INSERT INTO `mt4_trades` VALUES (4, 80000000, 'USA.30', 2, 1, 100, '2019-07-02 08:00:51', 26725.5, 0, 0, '2019-07-03 04:01:14', '1970-01-01 00:00:00', 0, 1, 1, -50, 0, -12, 26762.5, -370, 0, '', 0, 1, 1562126474, 0, 0, 0, 0, '2019-07-03 03:01:14');
-INSERT INTO `mt4_trades` VALUES (5, 80000000, 'FRA.40', 2, 0, 100, '2019-07-02 08:00:53', 5582.17, 0, 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', 0, 1.12939, 0, -50, 0, -27.04, 5598.64, 184.87, 0, '', 0, 1, 1562536806, 0, 0, 0, 0, '2019-07-07 21:10:26');
-INSERT INTO `mt4_trades` VALUES (6, 80000000, 'UK.100', 2, 1, 100, '2019-07-02 08:00:57', 7524.59, 0, 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', 0, 1.26371, 0, -50, 0, -30.16, 7571.71, -590.09, 0, '', 0, 1, 1562536806, 0, 0, 0, 0, '2019-07-07 21:10:26');
-INSERT INTO `mt4_trades` VALUES (7, 80000000, 'SPX500', 2, 1, 100, '2019-07-02 08:01:01', 2968.13, 0, 0, '2019-07-03 04:01:20', '1970-01-01 00:00:00', 0, 1, 1, -50, 0, -12, 2977.88, -97.5, 0, '', 0, 1, 1562126480, 0, 0, 0, 0, '2019-07-03 03:01:20');
-INSERT INTO `mt4_trades` VALUES (8, 80000000, 'SPX500', 2, 1, 100, '2019-07-02 09:15:28', 2960.38, 0, 0, '2019-07-02 09:15:38', '1970-01-01 00:00:00', 0, 1, 1, -50, 0, 0, 2965.38, -50, 0, '', 0, 1, 1562058938, 0, 0, 0, 0, '2019-07-02 08:15:38');
-INSERT INTO `mt4_trades` VALUES (9, 80000000, 'GER.30', 2, 1, 100, '2019-07-02 09:15:32', 12499.35, 0, 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', 0, 1.12901, 0, -50, 0, -27.04, 12580.21, -907.65, 0, '', 0, 1, 1562536806, 0, 0, 0, 0, '2019-07-07 21:10:26');
-INSERT INTO `mt4_trades` VALUES (10, 80000000, 'CHA50', 1, 0, 100, '2019-07-02 09:26:42', 13853.8, 0, 0, '2019-07-03 04:01:23', '1970-01-01 00:00:00', 0, 1, 1, -50, 0, -12, 13828.8, -250, 0, '', 0, 1, 1562126483, 0, 0, 0, 0, '2019-07-03 03:01:23');
-INSERT INTO `mt4_trades` VALUES (11, 80000000, 'MSCI.CN', 1, 0, 100, '2019-07-02 09:28:56', 23897.2, 0, 0, '2019-07-03 04:01:27', '1970-01-01 00:00:00', 0, 1, 1, -50, 0, -12, 23854.7, -425, 0, '', 0, 1, 1562126487, 0, 0, 0, 0, '2019-07-03 03:01:27');
-INSERT INTO `mt4_trades` VALUES (12, 80000000, 'OILUSD', 2, 1, 100, '2019-07-02 09:29:02', 58.93, 0, 0, '2019-07-03 04:01:28', '1970-01-01 00:00:00', 0, 58.93, 56.65, -50, 0, -12, 56.65, 2280, 0, '', 0, 1, 1562126488, 0, 0, 0, 0, '2019-07-03 03:01:28');
-INSERT INTO `mt4_trades` VALUES (13, 80000000, 'SPX500', 2, 0, 100, '2019-07-08 01:20:05', 2990.38, 0, 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', 0, 1, 0, -50, 0, 0, 2984.13, -62.5, 0, '', 0, 1, 1562548805, 0, 0, 0, 0, '2019-07-08 02:06:58');
-INSERT INTO `mt4_trades` VALUES (14, 80000000, 'USA.30', 2, 0, 100, '2019-07-08 01:22:33', 26857.5, 0, 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', 0, 1, 0, -50, 0, 0, 26843.5, -140, 0, '', 0, 1, 1562548953, 0, 0, 0, 0, '2019-07-08 02:06:58');
-INSERT INTO `mt4_trades` VALUES (15, 80000000, 'MSCI.CN', 1, 0, 100, '2019-07-08 02:00:51', 23612.2, 0, 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', 0, 1, 0, -50, 0, 0, 23457.2, -1550, 0, '', 0, 1, 1562551251, 0, 0, 0, 0, '2019-07-08 02:06:58');
-
 -- ----------------------------
 -- Table structure for mt4_users
 -- ----------------------------