持仓列表

application/market/home/Trade.php

@@ -166,15 +166,7 @@ class Trade extends Common
         //提交交易费用信息
         $Delivery = new Delivery;
         $avail    = ($moneyinfo['avail']) - $effectMoney;
-        $Qdata = z_market($data["gupiao_code"],$data['market']);
-        //参考成本价
-        $ck_price          = Position::calculate($data['sub_id'],$data["gupiao_code"],'price');
-        //买入均价
-        $buy_average_price = Position::calculate($data['sub_id'],$data["gupiao_code"],'average');
-        //参考盈亏
-        //$data[$k]['ck_profit']         = $item['stock_count'] > 0 ? round(($Qdata['Price']-$data[$k]['buy_average_price'])*$item['stock_count'], 2) : 0;
-
-        Position::addPosition($data['code'], $data['market'],$data['count'],$data['sub_id'],$broker['lid'],$broker['user'],$broker['stockjobber'],$ck_price, 0);
+        Position::addPosition($data['code'], $data['market'],$data['count'],$data['sub_id'],$broker['lid'],$broker['user'],$broker['stockjobber']);
         //print_r("佣金: ".$commission." 过户费: ".$transfer." 总计：".$effectMoney);Db::rollback();exit;
         $del_res  = $Delivery->add_m_delivery_order($data, $data['count'],$data['price'],$data['sub_id'],$broker['lid'],$broker['user'],$broker['stockjobber'],$commission,$transfer,$Trust_no,$avail,$amount, $data['model']);
         //print_r($del_res);Db::rollback();exit;

application/market/model/Position.php

@@ -205,9 +205,9 @@ class Position extends Model{
     * $sub_id 子账号
     * $code 股票代码
     */
-    public static function getCodePosition($sub_id,$code){
+    public static function getCodePosition($sub_id,$code,$market){
         $res=Db::name('stock_position')
-            ->where(['sub_id'=>$sub_id,'gupiao_code'=>$code])
+            ->where(['sub_id'=>$sub_id,'gupiao_code'=>$code,'market'=>$market])
             ->where(['buying'=>0])
             ->find();
         if(empty($res)){return false;}
@@ -418,12 +418,13 @@ class Position extends Model{
     * $user 证券账户
     * $soure 证券来源
     */
-    public static function addPosition($code,$market,$count,$sub_id,$lid,$user,$soure,$ck_price,$Trust_no)
+    public static function addPosition($code,$market,$count,$sub_id,$lid,$user,$soure)
     {
-        //if(!$count) return false;
+        if(!$count) return false;
         //$canbuy    = self::getCanbuyCount($sub_id,$code);
-        $position = self::getCodePosition($sub_id, $code);
+        $position = self::getCodePosition($sub_id,$code,$market);
         $canbuy_count=$position['canbuy_count']+$count;
+        $new_price=round(($position['canbuy_count']*$position['buy_average_price']+$count*$position['ck_price'])/$canbuy_count,3);
         $stockinfo = z_market($code,$market);
         $data      = array();
         $data[0]['sub_id']            = $sub_id;
@@ -435,14 +436,13 @@ class Position extends Model{
         $data[0]['count']             = $count;
         $data[0]['stock_count']       = $position['stock_count']+$count;
         $data[0]['canbuy_count']      = $position['canbuy_count']+$count;
-        $data[0]['ck_price']          = self::calculate($sub_id,$code,'price');//参考成本价
-        dump($data[0]['ck_price']);die;
-        $data[0]['buy_average_price'] = self::calculate($sub_id,$code,'average');//买入均价
-        $data[0]['ck_profit_price']   = '';//参考盈亏成本价
+        $data[0]['ck_price']          = $new_price;//参考成本价;
+        $data[0]['buy_average_price'] = $new_price;//买入均价
+        $data[0]['ck_profit_price']   = $new_price;//参考盈亏成本价
         $data[0]['now_price']         = $stockinfo["current_price"];//'当前价'
         $data[0]['market_value']      = $stockinfo["current_price"] * $count;//最新市值
-        $data[0]['ck_profit']         = $count > 0 ? bcmul(strval($stockinfo["current_price"] - $ck_price),strval($count),2) : 0; //参考浮动盈亏
-        $data[0]['profit_rate']       = $count > 0 && $ck_price > 0 ? bcdiv(strval($data[0]['ck_profit']),strval($ck_price * $count * 100),2) : 0; //盈亏比例
+        $data[0]['ck_profit']         = $position['ck_profit']; //参考浮动盈亏
+        $data[0]['profit_rate']       = $position['profit_rate']; //盈亏比例
         $data[0]['buying']            = 0;//买入成功
         $data[0]['selling']           = 0;//1、在途卖出
         $data[0]['gudong_code']       = "";//股东代码 无法模拟暂时空