service层调整对私支付轮循池

normandcrm/service/backend/controllers/PrivateAccountController.php

@@ -9,16 +9,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\PrivateAccount;
 
 class PrivateAccountController extends BaseController
@@ -53,7 +43,7 @@ class PrivateAccountController extends BaseController
     public function actionSave()
     {
         $request = \Yii::$app->request->post();
-        $params['url'] = isset($request['url']) ? $request['url'] : '';                               //钱包地址
+        $params['account'] = isset($request['account']) ? $request['account'] : '';                               //钱包地址
         $params['is_close'] = (int)$request['is_close'];                                              //是否启用
         $params['add_time'] = time();
 
@@ -72,11 +62,11 @@ class PrivateAccountController extends BaseController
     public function actionUpdatepage()
     {
         $request = \Yii::$app->request->post();
-        $params['url'] = isset($request['url']) ? $request['url'] : '';                               //钱包地址
+        $params['account'] = isset($request['account']) ? $request['account'] : '';                               //钱包地址
         $params['is_close'] = (int)$request['is_close'];                                              //是否启用
 
         $result = PrivateAccount::updateAll([
-            'url'=> $params['url'],
+            'account'=> $params['account'],
             'is_close'=> $params['is_close'],
         ],
             "id =".$request['id']);

normandcrm/service/backend/models/PrivateAccount.php

@@ -16,7 +16,7 @@ use Yii;
  * @property integer $add_time
  * @property integer $is_close
  * @property integer $is_used
- * @property string $url
+ * @property string $account
  */
 class PrivateAccount extends \yii\db\ActiveRecord
 {
@@ -44,7 +44,7 @@ class PrivateAccount extends \yii\db\ActiveRecord
     {
         return [
             [['id', 'add_time','is_close','is_used'], 'number'],
-            [['url'], 'string'],
+            [['account'], 'string'],
         ];
     }
 
@@ -58,7 +58,7 @@ class PrivateAccount extends \yii\db\ActiveRecord
         if(empty($res)){
             return false;//没有开放的对公帐户
         }
-        $sql = "select url from crm_private_account where is_close = 0 and is_used = 0 order by id desc limit 1";
+        $sql = "select 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){
             return $account_arr[0];

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 14:52:52
 */
 
 SET NAMES utf8mb4;
@@ -347,6 +347,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 +356,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, 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, '');
 
 -- ----------------------------
 -- Table structure for crm_member_bank_info
@@ -547,6 +548,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,
+  `url` 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 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 = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
+
 -- ----------------------------
 -- Table structure for crm_remit_log
 -- ----------------------------