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

application/function.php

@@ -1224,7 +1224,7 @@ 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], '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' => '', 'highest' => $res[41], 'lowest' => $res[42], 'volume' => $res[36], 'turnover' => $res[37], 'time' => $time, 'turnover_rate' => $res[38], 'pe_ratio' => $res[39], 'circulation_market_value' => $res[44], 'total_market_value' => $res[45], 'pb_ratio' => $res[46]);
+			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]);
 		}
 	}
 

application/market/home/Index.php

@@ -81,20 +81,21 @@ class Index extends Common
     public function market()
     {
         $req = request();
+        $market = $req::instance()->param('market');
         $code = $req::instance()->param('code');
         $uid = $req::instance()->param('uid');
         if ($code === null) {
             return json(['data' => null, 'status' => 0, 'message' => '缺少参数code，操作失败']);
         }
-        $data = z_market($code);
+        $data = z_market(strtolower($market).$code);
         if (!$data) {
             return json(['data' => $data, 'status' => 0, 'message' => '操作失败']);
         }
-        $p_range = $data['currency'] - $data['yesterday_price'];
+        /*$p_range = $data['currency'] - $data['yesterday_price'];
         $data['price_range'] = round($p_range,2);
-        $data['price_rate'] = round(($p_range/$data['yesterday_price']*100),2);
+        $data['price_rate'] = round(($p_range/$data['yesterday_price']*100),2);*/
         $self = new StockSubAccountSelf();
-        $ret = $self->myadd($uid, $code);//查找是否存在
+        $ret = $self->myadd($uid, $market,$code);//查找是否存在
         if ($ret) {
             $data['myselect'] = 1;
         }else{
@@ -263,22 +264,23 @@ class Index extends Common
         $req = request();
         $uid = $req::instance()->param('uid');
         $name = $req::instance()->param('name');
+        $market = $req::instance()->param('market');
         $code = $req::instance()->param('code');
         $self = new StockSubAccountSelf();
 
         if (!empty($name) && !empty($code) && $uid == MID) {
-            $ret = $self->myadd($uid, $code);//查找是否存在
+            $ret = $self->myadd($uid,$market, $code);//查找是否存在
             if ($ret) {
                 return json(['status' => 0, 'message' => '此股票已存在，添加失败']);
             }
-            $res = $self->addmyselect($uid, $name, $code);
+            $res = $self->addmyselect($uid, $name,$market, $code);
         } else {
             $res = false;
         }
         if (!$res) {
             return json(['status' => 0, 'message' => '添加失败']);
         }
-        $data = $self->myadd($uid, $code);
+        $data = $self->myadd($uid,$market, $code);
         if (!$data) {
             return json(['status' => 0, 'message' => '系统错误']);
         }
@@ -298,11 +300,12 @@ class Index extends Common
         $uid = MID;
         $req = request();
         $code = intval($req::instance()->param('code'));
+        $market = intval($req::instance()->param('market'));
         if ($code === null) {
             return json(['status' => 0, 'message' => '缺少参数code，操作失败']);
         } else {
             $self = new StockSubAccountSelf();
-            $res = $self->delmyselectbycode($uid, $code);
+            $res = $self->delmyselectbycode($uid,$market, $code);
         }
         if (!$res) {
             return json(['status' => 0, 'message' => '删除失败']);
@@ -320,10 +323,11 @@ class Index extends Common
             json(['status' => 0, 'message' => '请登录！']);
         }
         $uid = MID;
-        if(!uid){
+        if(!$uid){
             return json(['status' => 0, 'message' => '请登录后操作']);
         }
         $req = request();
+        $marketarr = trim($req::instance()->param('market'));
         $code = trim($req::instance()->param('code'));
         $codeArr = explode(',',$code);
         if(!is_array($codeArr)){
@@ -335,7 +339,8 @@ class Index extends Common
             $self = new StockSubAccountSelf();
             foreach($codeArr as $k=>$v){    
                 $delcode = intval($v);
-                $res = $self->delmyselectbycode($uid, $delcode);
+                $market = $marketarr[$k];
+                $res = $self->delmyselectbycode($uid,$market, $delcode);
             }
         }
         if (!$res) {

application/market/model/StockSubAccountSelf.php

@@ -22,9 +22,10 @@ class StockSubAccountSelf extends Model{
      * $code 股票代码
      * $sub_id 子账户id
      */
-    public function addmyselect($uid,$name,$code,$sub_id=0){
+    public function addmyselect($uid,$name,$market,$code,$sub_id=0){
         $data['uid']=$uid;
         $data['sub_id']=$sub_id;
+        $data['market'] =$market;
         $data['gupiao_name']=$name;
         $data['gupiao_code']=$code;
         $data['creat_time']=time();
@@ -43,9 +44,10 @@ class StockSubAccountSelf extends Model{
     /*
      * 查找我的自选
      */
-    public function myadd($uid,$code){
+    public function myadd($uid,$market,$code){
         $data=Db::name('stock_subaccount_self')
             ->where('uid='.$uid)
+            ->where('market',"=",$market)
             ->where('gupiao_code='.$code)
             ->find();
         return $data;
@@ -53,9 +55,10 @@ class StockSubAccountSelf extends Model{
     /*
      * 删除我的自选
      */
-    public function delmyselectbycode($uid,$code){
+    public function delmyselectbycode($uid,$market,$code){
         $data=Db::name('stock_subaccount_self')
             ->where('uid='.$uid)
+            ->where('market',"=",$market)
             ->where('gupiao_code='.$code)
             ->delete();
         return $data;