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

application/function.php

@@ -247,9 +247,9 @@ if (!function_exists('getEndDay')) {
 			$res = \think\Db::name('admin_config')->where(array('name' => 'market_data_in'))->value('value');
 
 			//判断股票前缀
-			if(toMarket($code)){
+			/*if(toMarket($code)){
 				$market = toMarket($code);
-			};
+			};*/
 			$code=strtolower($market).$code;
 			//判断股票是否
 

application/market/home/Index.php

@@ -58,7 +58,7 @@ class Index extends Common
             $map['title'] = ['like', "%$key%"];
         }
         $map['status'] = 1;
-        $data=Db::name('stock_list')->field('code,title,pinyin')->where($map)->limit(10)->select();
+        $data=Db::name('stock_list')->field('code,title,pinyin,market')->where($map)->limit(10)->select();
 
         if (!$data) {
             return json(['data' => $data, 'status' => 0, 'message' => '操作失败']);
@@ -69,6 +69,7 @@ class Index extends Common
                 $res[$k]['code']=$v['code'];
                 $res[$k]['name']=$v['title'];
                 $res[$k]['pin']=$v['pinyin'];
+                $res[$k]['market']=$v['market'];
             }
         }
         return json(['data' => $res, 'status' => 1, 'message' => '操作成功']);

application/market/model/Deal_stock.php

@@ -69,7 +69,7 @@ class Deal_stock extends Model{
      * 返回子账号成交
      * $sub_id 子账号
      */
-    public function get_deal_stock($sub_id,$beginday,$endday){
+    public function get_deal_stock($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);}
@@ -80,6 +80,7 @@ class Deal_stock extends Model{
             ->where('deal_date','>=',$beginday)
             ->where('deal_date','<=',$endday)
             ->order('id desc')
+            ->paginate($offset, false, ['query' => request()->param()])
             ->select();
 
         if(!$res||count($res)===0){

application/market/model/Delivery.php

@@ -57,7 +57,7 @@ class Delivery extends Model{
      * 返回对应交割单
      * $sub_id 子账号
      */
-    public function get_delivery_order($sub_id,$beginday="",$endday=""){
+    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);}
         $res=Db::name('stock_delivery_order')
@@ -66,6 +66,7 @@ class Delivery extends Model{
             ->where('deal_date','>=',$beginday)
             ->where('deal_date','<=',$endday)
             ->order('id desc')
+            ->paginate($offset, false, ['query' => request()->param()])
             ->select();
         return $res;
     }

application/market/model/Trust.php

@@ -234,13 +234,15 @@ class Trust extends Model{
      * 返回子账号委托
      * $sub_id 子账号
      */
-    public function get_trust($sub_id,$beginday,$endday){
+    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);}
         $res=Db::name('stock_trust')
             ->where(['sub_id'=>$sub_id])
             ->where('trust_date','>=',$beginday)
             ->where('trust_date','<=',$endday)
+            ->order('id desc')
+            ->paginate($offset, false, ['query' => request()->param()])
             ->select();
         return $res;
     }
@@ -300,7 +302,7 @@ class Trust extends Model{
         if ($res) return ['status'=>0, 'message'=>'该股票禁止交易'];
         //判断购买数量书否正确
         if (($data['count'] % 100) != 0) return ['status'=>0, 'message'=>'交易数量必须是100的整数倍'];
-        $bs_res = Db::name('stock_borrow')->where(array('stock_subaccount_id' => $data['subid']))->find();
+        $bs_res = Db::name('stock_borrow')->where(array('stock_subaccount_id' => $data['sub_id']))->find();
         if (empty($bs_res)) {
             return ['status'=>0, 'message'=>'没有对应的配资'];
         }

application/market/validate/Trade.php

 <?php
-namespace app\apicom\validate;
+namespace app\market\validate;
 
 use think\Validate;