Merge branch 'dev' of http://rungit.jxdsy.cn:10000/sugar/stock_new into dev

application/apicom/home/Withdraw.php

@@ -34,20 +34,39 @@ class Withdraw extends Common
     public function index()
     {
         $money = \app\money\model\Money::getMoney(MID);
-        $money['account'] =bcdiv($money['account'],100,2);
-        $money['operate_account'] = bcdiv($money['operate_account'],100,2);
-        $money['operate_account'] = bcdiv($money['operate_account'],100,2);
+        $money['account'] = bcdiv($money['account'], 100, 2);
+        $money['operate_account'] = bcdiv($money['operate_account'], 100, 2);
+        $money['operate_account'] = bcdiv($money['operate_account'], 100, 2);
         $banks = BankModel::getBank(MID);
 
-        if(empty($banks)) ajaxmsg('您未绑定银行卡，请先绑定银行卡',0);
+        if (empty($banks)) ajaxmsg('您未绑定银行卡，请先绑定银行卡', 0);
 
         $data['money'] = $money;
         $data['banks'] = $banks;
         $data['default_bank'] = $banks[0];
-        $data['bankSetting'] =  preg_replace('/\|img/', '',config("web_bank"));
-
-        ajaxmsg('线下提现信息',1,$data);
+        $data['bankSetting'] =  preg_replace('/\|img/', '', config("web_bank"));
 
+        ajaxmsg('线下提现信息', 1, $data);
+    }
+    /**
+     * 提现规则说明
+     */
+    public function withdrawRule()
+    {
+        //最低提现金额
+        $minimum = config('withdraw_minimum');
+        //最高提现金额
+        $maximum = config('withdraw_maximum');
+        //提现手续费比例
+        $rate = config('withdraw_rate');
+        //提现审核时间
+        $withdraw_audit_time = config('withdraw_audit_time');
+        $rule = [];
+        $rule[0] = "1.单笔提现最低金额：" . $minimum;
+        $rule[1] = "2.单笔提现最高金额：" . $maximum;
+        $rule[2] = "3.提现手续费" . $rate . "%";
+        $rule[4] = "4.提现审核时间" . $withdraw_audit_time;
+        ajaxmsg('提现规则说明', 1, $rule);
     }
     /*
      * 操作提现操作
@@ -58,37 +77,37 @@ class Withdraw extends Common
         $data = $this->request->post();
         $data['mid'] = MID;
         $result = $this->validate($data, "Withdraw.create");
-        if(true !== $result){
-            ajaxmsg($result,0);
+        if (true !== $result) {
+            ajaxmsg($result, 0);
             //$this->error($result);
         }
-        if($data['money']<0){
-            ajaxmsg('提现金额错误！',0);
+        if ($data['money'] < 0) {
+            ajaxmsg('提现金额错误！', 0);
         }
-        $money_res=Db::name('money')->where(['mid'=>MID])->find();
-        if(empty($money_res['account'])){
-            ajaxmsg('查询账户资金出错！',0);
+        $money_res = Db::name('money')->where(['mid' => MID])->find();
+        if (empty($money_res['account'])) {
+            ajaxmsg('查询账户资金出错！', 0);
         }
-        if(isset($money_res['account'])&&$money_res['account']<$data['money']){
-            ajaxmsg('提现金额已经大于可用余额！',0);
+        if (isset($money_res['account']) && $money_res['account'] < $data['money']) {
+            ajaxmsg('提现金额已经大于可用余额！', 0);
         }
-        $withdraw_info=Db::name('money_withdraw')
-            ->where(['mid'=>MID])
-            ->where(['status'=>0])
+        $withdraw_info = Db::name('money_withdraw')
+            ->where(['mid' => MID])
+            ->where(['status' => 0])
             ->find();
-        if(!empty($withdraw_info)){
-            ajaxmsg('您已有提现申请，请耐心等待审核。',0);
+        if (!empty($withdraw_info)) {
+            ajaxmsg('您已有提现申请，请耐心等待审核。', 0);
         }
-        $c = Db::name('member')->where(["id"=>MID])->find();
-        if(Hash::check((string)$data['paywd'], $c['paywd'])){
+        $c = Db::name('member')->where(["id" => MID])->find();
+        if (Hash::check((string)$data['paywd'], $c['paywd'])) {
             $res = WithdrawModel::saveData($data);
-        }else{
-            ajaxmsg('支付密码错误',0);
+        } else {
+            ajaxmsg('支付密码错误', 0);
         }
-        if($res['status']){
-            ajaxmsg('提现申请已提交，请耐心等待审核',1);
-        }else{
-            ajaxmsg('提现申请提交失败',0);
+        if ($res['status']) {
+            ajaxmsg('提现申请已提交，请耐心等待审核', 1);
+        } else {
+            ajaxmsg('提现申请提交失败', 0);
         }
     }
-}
+}
\ No newline at end of file

application/function.php

@@ -447,12 +447,16 @@ if (!function_exists('getEndDay')) {
 	if (!function_exists('sina_market')) {
 		function sina_market($code)
 		{
+			$headers = array(
+				'referer: http://finance.sina.com.cn',
+			);
 			$d = fenxi($code);
 			$randm = time() . mt_rand(100, 999);
 			$ch = curl_init();
 			curl_setopt($ch, CURLOPT_URL, 'http://hq.sinajs.cn/rn=' . $randm . '&list=' . $d . ',' . $d . '_i');
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 			curl_setopt($ch, CURLOPT_HEADER, 0);
+			curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
 			$output = curl_exec($ch);
 			curl_close($ch);
 			$pos = strpos($output, '=') + 2;
@@ -1226,7 +1230,11 @@ if (!function_exists('getEndDay')) {
 				$time = date('H:i:s', time());
 			}
 
-			return array('code' => $res[2], 'name' => $res[1], 'yesterday_price' => $res[4], 'open_price' => $res[5], 'national_debt' => '0.00', 'current_price' => $res[3], 'buy_one_price' => $res[9], 'buy_two_price' => $res[11], 'buy_three_price' => $res[13], 'buy_one_amount' => $res[10], 'buy_two_amount' => $res[12], 'buy_three_amount' => $res[14], 'sell_one_price' => $res[19], 'sell_two_price' => $res[21], 'sell_three_price' => $res[23], 'sell_one_amount' => $res[20], 'sell_two_amount' => $res[22], 'sell_three_amount' => $res[24], 'buy_four_price' => $res[15], 'buy_five_price' => $res[17], 'buy_four_amount' => $res[16], 'buy_five_amount' => $res[18], 'sell_four_price' => $res[25], 'sell_five_price' => $res[27], 'sell_four_amount' => $res[26], 'sell_five_amount' => $res[28],'mini_trans' => 100, 'buy_chang_price' => '0.01', 'sell_chang_price' => '0.01', 'type' => 1, 'currency' => 0, 'debt_sign' => 255, 'info' => '', 'last_date_time'=>$res[30], 'price_range' => $res[31], 'price_rate' => $res[32],  'highest' => $res[33], 'lowest' => $res[34], 'volume' => $res[36], 'turnover' => $res[37], 'time' => $time,  'pe_ratio' => $res[39], 'exchange_code' => $res[40], 'amplitude'=>$res[43], 'circulation_market_value' => $res[44], 'total_market_value' => $res[45], 'pb_ratio' => $res[58],'turnover_rate' => $res[59]);
+			if(toMarket($res[2]) == "HK"){
+				return array('code' => $res[2], 'name' => $res[1], 'yesterday_price' => $res[4], 'open_price' => $res[5], 'national_debt' => '0.00', 'current_price' => $res[3], 'buy_one_price' => $res[9], 'buy_two_price' => $res[11], 'buy_three_price' => $res[13], 'buy_one_amount' => $res[10], 'buy_two_amount' => $res[12], 'buy_three_amount' => $res[14], 'sell_one_price' => $res[19], 'sell_two_price' => $res[21], 'sell_three_price' => $res[23], 'sell_one_amount' => $res[20], 'sell_two_amount' => $res[22], 'sell_three_amount' => $res[24], 'buy_four_price' => $res[15], 'buy_five_price' => $res[17], 'buy_four_amount' => $res[16], 'buy_five_amount' => $res[18], 'sell_four_price' => $res[25], 'sell_five_price' => $res[27], 'sell_four_amount' => $res[26], 'sell_five_amount' => $res[28],'mini_trans' => 100, 'buy_chang_price' => '0.01', 'sell_chang_price' => '0.01', 'type' => 1, 'currency' => 0, 'debt_sign' => 255, 'info' => '', 'last_date_time'=>$res[30], 'price_range' => $res[31], 'price_rate' => $res[32],  'highest' => $res[33], 'lowest' => $res[34], 'volume' => $res[36], 'turnover' => $res[37], 'time' => $time,  'pe_ratio' => $res[39], 'exchange_code' => $res[40], 'amplitude'=>$res[43], 'circulation_market_value' => $res[44], 'total_market_value' => $res[45], 'pb_ratio' => $res[58],'turnover_rate' => $res[59]);
+			}else{
+				return array('code' => $res[2], 'name' => $res[1], 'yesterday_price' => $res[4], 'open_price' => $res[5], 'national_debt' => '0.00', 'current_price' => $res[3], 'buy_one_price' => $res[9], 'buy_two_price' => $res[11], 'buy_three_price' => $res[13], 'buy_four_price' => $res[15], 'buy_five_price' => $res[17], 'buy_one_amount' => $res[10], 'buy_two_amount' => $res[12], 'buy_three_amount' => $res[14], 'buy_four_amount' => $res[16], 'buy_five_amount' => $res[18], 'sell_one_price' => $res[19], 'sell_two_price' => $res[21], 'sell_three_price' => $res[23], 'sell_four_price' => $res[25], 'sell_five_price' => $res[27], 'sell_one_amount' => $res[20], 'sell_two_amount' => $res[22], 'sell_three_amount' => $res[24],'sell_four_amount' => $res[26], 'sell_five_amount' => $res[28], 'exchange_code' => $res[40], 'mini_trans' => 100, 'buy_chang_price' => '0.01', 'sell_chang_price' => '0.01', 'type' => 1, 'currency' => 0, 'debt_sign' => 255, 'info' => '','price_range' => $res[31], 'price_rate' => $res[32],'highest' => $res[41], 'lowest' => $res[42], 'volume' => $res[36], 'turnover' => $res[37], 'time' => $time, 'turnover_rate' => $res[38], 'pe_ratio' => $res[39], 'amplitude'=>$res[43], 'circulation_market_value' => $res[44], 'total_market_value' => $res[45], 'pb_ratio' => $res[46]);
+			}
 		}
 	}
 

application/market/command/TrustCommand.php

@@ -3,9 +3,11 @@ declare (strict_types = 1);
 
 namespace app\market\command;
  
+use app\admin\model\Config as ConfigModel;
 use app\market\model\Deal_stock;
 use app\market\model\Position;
 use app\market\model\SubAccountMoney;
+use think\Config;
 use think\console\Command;
 use think\console\Input;
 use think\console\input\Argument;
@@ -27,11 +29,18 @@ class TrustCommand extends Command
     protected function execute(Input $input, Output $output)
     {
         // 启动协程
-        //if(!checkTradeTime()) return false;
-        $time  = config('trust_active_time')*60 ??  TRUST_ACTIVE_TIME;
-        // 处理超时委托线程
-        $res_c = Db::name('stock_trust')->where('status','已委托')->where("add_time", "<=", time() - $time)->select();
-        if (!empty($res_c)) $this->cancelTrusts($res_c);
+        //if (!yan_time()) return false;
+        $trust_active_time=ConfigModel::where(['name'=>"trust_active_time"])->value("value");
+        $time  = $trust_active_time * 60 ??  TRUST_ACTIVE_TIME;
+        if($time>0){
+            $res_c = Db::name('stock_trust')->where('status','已委托')->where("add_time", "<=", time() - $time)->select();
+        }else if(time() > strtotime("today 17:00")){//0表示当日有效
+            $res_c = Db::name('stock_trust')->where('status','已委托')->select();
+        }else {
+            $res_c = null;
+        }
+         if (!empty($res_c)) $this->cancelTrusts($res_c);
+
         // 处理委托交易线程
         //$res_t = Db::name('stock_trust')->where('status','已委托')->where("add_time", "between",[time() - $time, time()])->whereDay('trust_date')->select()->toArray();
         $res_t = Db::name('stock_trust')->where('status','已委托')->select();

application/market/home/Trade.php

@@ -79,7 +79,7 @@ class Trade extends Common
         if (!$data || count($data) === 0) return ajaxmsg('没有数据',0,$data);
         foreach ($data as $k => $item){
             //查询当天交易的数量 T+1 交易
-            $todayCount = Delivery::get_delivery_order($subid,$item["gupiao_code"]);
+            //$todayCount = Delivery::get_delivery_order($subid,$item["gupiao_code"]);
             $data[$k]['canbuy_count']      = $item['canbuy_count'];
             //查询股票最新行情
             $Qdata = z_market($item["gupiao_code"],$item['market']);
@@ -260,8 +260,8 @@ class Trade extends Common
         $mid = isLogin($token);
         if(!$mid) return json(['status' => 0, 'message' => '登陆后才能进行查看']);
         $sub_id    = input('id', '', ['trim', FILTER_SANITIZE_NUMBER_INT]);
-        $startDate = input('start_date', '');
-        $endDate   = input('end_date', '');
+        $startDate = input('beginday', '');
+        $endDate   = input('endday', '');
         $page      = input('page', 1, ['trim', FILTER_SANITIZE_NUMBER_INT]);
         $submodel  = new StockSubAccount;
         $res = $submodel->get_account_by_id($sub_id);
@@ -346,8 +346,8 @@ class Trade extends Common
         $mid = isLogin($token);
         if(!$mid) return json(['status' => 0, 'message' => '登陆后才能进行查看']);
         $sub_id    = input('id', '', ['trim', FILTER_SANITIZE_NUMBER_INT]);
-        $startDate = input('start_date', '');
-        $endDate   = input('end_date', '');
+        $startDate = input('beginday', '');
+        $endDate   = input('endday', '');
         $page      = input('page', 1, ['trim', FILTER_SANITIZE_NUMBER_INT]);
         $submodel  = new StockSubAccount;
         $res       = $submodel->get_account_by_id($sub_id);
@@ -366,8 +366,8 @@ class Trade extends Common
         $mid = isLogin($token);
         if(!$mid) return json(['status' => 0, 'message' => '登陆后才能进行查看']);
         $sub_id    = input('id', '', ['trim', FILTER_SANITIZE_NUMBER_INT]);
-        $startDate = input('start_date', '');
-        $endDate   = input('end_date', '');
+        $startDate = input('beginday', '');
+        $endDate   = input('endday', '');
         $page      = input('page', 1, ['trim', FILTER_SANITIZE_NUMBER_INT]);
         $submodel  = new StockSubAccount;
         $res       = $submodel->get_account_by_id($sub_id);

application/market/model/Deal_stock.php

@@ -73,12 +73,14 @@ class Deal_stock extends Model{
 
         if(empty($endday)){$endday=time();}else{$endday=strtotime($endday);}
         if(empty($beginday)){$beginday=strtotime(date("Y-m-d",time()));}else{$beginday=strtotime($beginday);}
-
+        $sql = " deal_date >= ".$beginday . " and deal_date <= ".$endday;
+        if($beginday==$endday){
+            $sql = " deal_date >= ".$beginday;
+        }
         $res=Db::name('stock_deal_stock')
             ->where(['sub_id'=>$sub_id])
             ->where('status','<>',0)
-            ->where('deal_date','>=',$beginday)
-            ->where('deal_date','<=',$endday)
+            ->where($sql)
             ->order('id desc')
             ->paginate($offset, false, ['query' => request()->param()])
             ->select();

application/market/model/Delivery.php

@@ -60,11 +60,14 @@ class Delivery extends Model{
     public function get_delivery_order($sub_id,$beginday="",$endday="",$offset=15){
         if(empty($endday)){$endday=time();}else{$endday=strtotime($endday)+86400;}
         if(empty($beginday)){$beginday=strtotime(date("Y-m-d",time()));}else{$beginday=strtotime($beginday);}
+        $sql = " deal_date >= ".$beginday . " and deal_date <= ".$endday;
+        if($beginday==$endday){
+            $sql = " deal_date >= ".$beginday;
+        }
         $res=Db::name('stock_delivery_order')
             ->where(['sub_id'=>$sub_id])
             ->where(['status'=>1])
-            ->where('deal_date','>=',$beginday)
-            ->where('deal_date','<=',$endday)
+            ->where($sql)
             ->order('id desc')
             ->paginate($offset, false, ['query' => request()->param()])
             ->select();

application/market/model/Trust.php

@@ -237,10 +237,13 @@ class Trust extends Model{
     public function get_trust($sub_id,$beginday,$endday,$offset=15){
         if(empty($endday)){$endday=time();}else{$endday=strtotime($endday);}
         if(empty($beginday)){$beginday=strtotime(date("Y-m-d",time()));}else{$beginday=strtotime($beginday);}
+        $sql = " trust_date >= ".$beginday . " and trust_date <=".$endday;
+        if($beginday==$endday){
+           $sql = " trust_date >= ".$beginday;
+        }
         $res=Db::name('stock_trust')
             ->where(['sub_id'=>$sub_id])
-            ->where('trust_date','>=',$beginday)
-            ->where('trust_date','<=',$endday)
+            ->where($sql)
             ->order('id desc')
             ->paginate($offset, false, ['query' => request()->param()])
             ->select();

application/money/admin/Esopplan.php

@@ -83,7 +83,7 @@ class Esopplan extends Admin
             $data['create_time'] = time();
             $data['plan_account'] = $data['plan_account'] * 100;
             $data['remain_account'] = $data['plan_account'] * 100;
-            $data['create_ip'] = get_client_ip(1);
+            $data['create_ip'] = get_client_ip(0);
             //业务逻辑处理
             $result_up = Db::name("esop_plan")->insert($data);
             if ($result_up === 1) {

application/money/admin/Esopplanrecord.php

@@ -112,7 +112,7 @@ class EsopplanRecord extends Admin
                     'type' => 1,
                     'info' => "自动行权，期权增加" . ($affect / 100),
                     'create_time' => time(),
-                    'create_ip' => get_client_ip(1)
+                    'create_ip' => get_client_ip(0)
                 ];
                 EsopPlanRecordModel::create($arr);
             }

application/money/admin/Withdraw.php

@@ -67,7 +67,9 @@ class Withdraw extends Admin
                 ['order_no', '订单号'],
                 ['mobile', '手机号'],
                 ['name', '姓名'],
-                ['money', '金额'],
+                ['money', '申请金额'],
+                ['fee','手续费'],
+                ['real_money','到账金额'],
                 ['bank', '银行信息'],
                 ['status', '状态'],
                 ['create_time', '申请时间', 'datetime'],

application/money/model/EsopPlan.php

@@ -66,9 +66,10 @@ class EsopPlan extends Model
         $data['bank'] = $bank['bank'] . "|" . $bank['card'] . '|' . $bank['province'] . $bank['city'] . $bank['branch'] . "|" . $names['name'];
         $data['mid'] = $parameter['mid'];
         $data['money'] = $parameter['money'] * 100;
+        $data['fee'] = $parameter['money'] * 100 * config('withdraw_rate');
         $data['order_no'] = 'tx' . generate_rand_str(10, 3);
         $data['create_time'] = time();
-        $data['create_ip'] = get_client_ip(1);
+        $data['create_ip'] = get_client_ip(0);
 
         Db::startTrans();
         //查看当前期权的信息
@@ -89,7 +90,7 @@ class EsopPlan extends Model
                 'type' => 3,
                 'info' => "期权申请提现，金额：" . $parameter['money'],
                 'create_time' => time(),
-                'create_ip' => get_client_ip(1)
+                'create_ip' => get_client_ip(0)
             ];
             $res2 = EsopPlanRecordModel::create($arr);
             //更新期权信息