wanggangtao 5 年之前
父節點
當前提交
a2dd64dc81

+ 4 - 2
api/v1.0/demo/stock_any_day.html

@@ -18,6 +18,7 @@
                 var method = $('input[name="method"]').val();
                 var code = $('input[name="code"]').val();
                 var date = $('input[name="date"]').val();
+                var fq_price = $('input[name="fq_price"]').val();
                 var timestamp = $('input[name="timestamp"]').val();
                 var sign = $.md5(method+timestamp);
                 $('#sign').val(sign);
@@ -27,6 +28,7 @@
                         'method' :method,
                         'code' :code,
                         'date' :date,
+                        'fq_price' :fq_price,
                         'timestamp' :timestamp,
                         'sign'   : sign
                     },
@@ -77,9 +79,9 @@
                 <span>date</span>
                 <input type="text" class="input-text"  name="date" value=20201210 />
             </p>
-
             <p>
-
+                <span>fq_price:前复权-1,不复权-0</span>
+                <input type="text" class="input-text"  name="fq_price" value=1 />
             </p>
             <p><span>校验码:</span><input type="text" class="input-text" id="sign" readonly/></p>
             <p><button class="button success small" id="btn" type="button">发送请求</button></p>

+ 7 - 1
api/v1.0/demo/stock_current_day.html

@@ -17,6 +17,8 @@
             $('#btn').click(function(){
                 var method = $('input[name="method"]').val();
                 var code = $('input[name="code"]').val();
+                var fq_price = $('input[name="fq_price"]').val();
+
                 var timestamp = $('input[name="timestamp"]').val();
                 var sign = $.md5(method+timestamp);
                 $('#sign').val(sign);
@@ -25,6 +27,9 @@
                     data         : {
                         'method' :method,
                         'code' :code,
+                        'fq_price' :fq_price,
+
+
                         'timestamp' :timestamp,
                         'sign'   : sign
                     },
@@ -72,7 +77,8 @@
 
 
             <p>
-
+                <span>fq_price:前复权-1,不复权-0</span>
+                <input type="text" class="input-text"  name="fq_price" value=1 />
             </p>
             <p><span>校验码:</span><input type="text" class="input-text" id="sign" readonly/></p>
             <p><button class="button success small" id="btn" type="button">发送请求</button></p>

文件差異過大導致無法顯示
+ 1 - 1
api/v1.0/stock_any_day.php


文件差異過大導致無法顯示
+ 1 - 1
api/v1.0/stock_current_day.php


文件差異過大導致無法顯示
+ 1 - 1
api/v1.0/stock_day_k.php


+ 2 - 2
lib/day_k.class.php

@@ -50,10 +50,10 @@ class Day_k {
     }
 
 
-    static public function get_current_day_k($code,$date)
+    static public function get_current_day_k($code,$date,$fq_price)
     {
         $Table_day_k = new Table_day_k();
-        return $Table_day_k->get_current_day_k($code,$date);
+        return $Table_day_k->get_current_day_k($code,$date,$fq_price);
     }
 
 

+ 57 - 26
lib/table/table_day_k.class.php

@@ -360,36 +360,67 @@ class Table_day_k extends Table {
      * 获取股票的某天和当天的数据
      * 当获取某天的数据不存在,返回空,当天的数据不存在,返回最近一个交易日的信息
      */
-    public function get_current_day_k($code,$date)
+    public function get_current_day_k($code,$date=0,$fq_price=0)
     {
-        //查询语句必须用sql_check_input检查参数
-        $stock_code = $this->pdo->sql_check_input(array('string', $code));//类型是字符串,那一定要在条件中将数据使用引号引用起来,否则不使用索引
-        $sql = "select * from ". $this->table_fullname ." where 1=1 ";
-        $where =" and day_k_code=".$stock_code  ;
-        if($date==0){//获取的是当天的数据
+        if($fq_price==0)//不复权
+        {
+            //查询语句必须用sql_check_input检查参数
+            $stock_code = $this->pdo->sql_check_input(array('string', $code));//类型是字符串,那一定要在条件中将数据使用引号引用起来,否则不使用索引
+            $sql = "select * from ". $this->table_fullname ." where 1=1 ";
+            $where =" and day_k_code=".$stock_code  ;
+            if($date==0){//获取的是当天的数据
+                $date=date("Ymd",time());
+                $where.=" and day_k_date <= ".$date;
+            }else{//获取某一天的数据
+                $date = $this->pdo->sql_check_input(array('number', $date));
+                $where.=" and day_k_date =".$date;
+            }
+            $sql.=$where;
+            $order=" order by day_k_date desc limit 1 ";
+            $sql.=$order;
+            $rs = $this->pdo->sqlQuery($sql);
+            $r  = array();
+            if($rs){
+                foreach($rs as $key => $val){
 
-//            $date = (int)(strtotime(date("Y-m-d",time())));
-            $date=date("Ymd",time());
-            $where.=" and day_k_date <= ".$date;
+                    $r[$key] = $this->dataToAttr($val);
+                }
+                return $r[0];
+            }else{
+                return $r;
+            }
 
-        }else{//获取某一天的数据
-            $date = $this->pdo->sql_check_input(array('number', $date));
-            $where.=" and day_k_date =".$date;
-        }
-        $sql.=$where;
-        $order=" order by day_k_date desc limit 1 ";
-        $sql.=$order;
-        $rs = $this->pdo->sqlQuery($sql);
-        $r  = array();
-        if($rs){
-            foreach($rs as $key => $val){
-
-                $r[$key] = $this->dataToAttr($val);
+        }else if($fq_price==1)//  复权
+        {
+//查询语句必须用sql_check_input检查参数
+            $stock_code = $this->pdo->sql_check_input(array('string', $code));//类型是字符串,那一定要在条件中将数据使用引号引用起来,否则不使用索引
+            $sql = "select * from ". $this->table_fullname ." where 1=1 ";
+            $where =" and day_k_code=".$stock_code  ;
+            if($date==0){//获取的是当天的数据
+                $date=date("Ymd",time());
+                $where.=" and day_k_date <= ".$date;
+            }else{//获取某一天的数据
+                $date = $this->pdo->sql_check_input(array('number', $date));
+                $where.=" and day_k_date =".$date;
             }
-            return $r[0];
-        }else{
-            return $r;
-        }
+            $sql.=$where;
+            $order=" order by day_k_date desc limit 1 ";
+            $sql.=$order;
+            $sql=" select * from(".$sql.")a left join boniu_day_k_qfq b on a.day_k_code=b.day_k_qfq_code and b.day_k_qfq_date=a.day_k_date ";
+            $rs = $this->pdo->sqlQuery($sql);
+            $r  = array();
+            if($rs){
+                foreach($rs as $key => $val){
+
+
+                    $r[$key] = $this->dataToAttr2($val);
+                }
+                return $r[0];
+            }else{
+                return $r;
+            }
+         }
+
     }