update

api/v1.0/demo/stock_day_k.html

@@ -22,6 +22,9 @@
                 var start_date = $('input[name="start_date"]').val();
                 var end_date = $('input[name="end_date"]').val();
                 var order = $('input[name="order"]').val();
+                var fq_price = $('input[name="fq_price"]').val();
+
+
 
 
 
@@ -34,6 +37,8 @@
                         'start_date' : start_date,
                         'end_date'   : end_date,
                         'order'      : order,
+                        'fq_price'   : fq_price,
+
 
                         'timestamp'  : timestamp,
                         'sign'       : sign
@@ -82,22 +87,23 @@
 
             <p>
                 <span>start_date:</span>
-                <input type="text" class="input-text"  name="start_date" value="2020/11/01"/>
+                <input type="text" class="input-text"  name="start_date" value="20201101"/>
             </p>
             <p>
                 <span>end_date</span>
-                <input type="text" class="input-text"  name="end_date" value="2020/12/11"/>
+                <input type="text" class="input-text"  name="end_date" value="20201211"/>
             </p>
 
             <p>
-                <span>order:升序-0，降序-1</span>
+                <span>order:1-降序，0-升序</span>
                 <input type="text" class="input-text"  name="order" value="1"/>
             </p>
 
-
             <p>
-
+                <span>fq_price:0：不复权 1:前复权</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>
         </form>

lib/day_k.class.php

@@ -43,10 +43,10 @@ class Day_k {
      * @return mixed
      * 获取历史日K数据
      */
-    static public function get_day_k_info($code,$start_date,$end_date,$order)
+    static public function get_day_k_info($code,$start_date,$end_date,$order,$fq_price)
     {
         $Table_day_k = new Table_day_k();
-        return $Table_day_k->get_day_k_info($code,$start_date,$end_date,$order);
+        return $Table_day_k->get_day_k_info($code,$start_date,$end_date,$order,$fq_price);
     }
 
 

lib/table/table_day_k.class.php

@@ -176,25 +176,51 @@ class Table_day_k extends Table {
      * @return array
      *
      */
-    public function get_day_k_info($code,$start_date,$end_date,$order_info)
+    public function get_day_k_info($code,$start_date,$end_date,$order_info,$fq_price)
     {
         //查询语句必须用sql_check_input检查参数
         $stock_code = $this->pdo->sql_check_input(array('string', $code));//类型是字符串，那一定要在条件中将数据使用引号引用起来,否则不使用索引
         $start_date= $this->pdo->sql_check_input(array('number', $start_date));
         $end_date = $this->pdo->sql_check_input(array('number', $end_date));
-        $sql = "select * from ". $this->table_fullname ." where 1=1 ";
-        $where =" and day_k_code=".$stock_code ." and day_k_timestamp between ".$start_date." and ".$end_date ;
-        $sql.=$where;
-        if($order_info==1)
-        {
-            $order=" order by day_k_timestamp desc";
+        $fq_price = $this->pdo->sql_check_input(array('number', $fq_price));
+
+        if($fq_price==1){//复权
+
+            $sql = "select * from ". $this->table_fullname ." where 1=1 ";
+            $where =" and day_k_code=".$stock_code ." and day_k_date>= ".$start_date." and day_k_date<= ".$end_date ;
+            $sql.=$where;
+
+
+            $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";
+
+            if($order_info==1)
+            {
+                $order=" order by day_k_date desc";
+            }
+            else
+            {
+                $order=" order by day_k_date asc";
+            }
+
+            $sql.=$order;
         }
         else
         {
-            $order=" order by day_k_timestamp asc";
+            $sql = "select * from ". $this->table_fullname ." where 1=1 ";
+            $where =" and day_k_code=".$stock_code ." and day_k_date>= ".$start_date." and day_k_date<= ".$end_date ;
+            $sql.=$where;
+            if($order_info==1)
+            {
+                $order=" order by day_k_date desc";
+            }
+            else
+            {
+                $order=" order by day_k_date asc";
+            }
+
+            $sql.=$order;
         }
 
-        $sql.=$order;
         $rs = $this->pdo->sqlQuery($sql);
         $r  = array();
         if($rs){