持仓列表

application/common.php

@@ -2209,4 +2209,4 @@ if(!function_exists('get_between')) {
         }
     }
 
-}
\ No newline at end of file
+}

application/market/model/Position.php

@@ -391,5 +391,27 @@ class Position extends Model{
         return $result;
     }
 
+    public static function calculate($sub_id,$code,$variable)
+    {
+        if(!$sub_id || !$code || !$variable) return 0;
+        switch ($variable) {
+            case 'price':
+                $order = Db::name('stock_delivery_order')->where(['sub_id' => $sub_id, 'gupiao_code' => $code,'status' => 1,'business_name' => '证券买入']);
+                $amount = $order->sum('liquidation_amount');
+                $volume = $order->sum('volume');
+                $result =  bcdiv(strval($amount),strval($volume),3);
+                break;
+            case 'average':
+                $order = Db::name('stock_delivery_order')->where(['sub_id' => $sub_id, 'gupiao_code' => $code,'status' => 1,'business_name' => '证券买入']);
+                $amount = $order->sum('residual_quantity');
+                $volume = $order->sum('volume');
+                $result =  bcdiv(strval($amount),strval($volume),3);
+                break;
+            default:
+                $result = 0;
+                break;
+        }
+        return $result;
+    }
 
 }
\ No newline at end of file

application/esop/admin/Index.php → application/money/admin/Esopplan.php

@@ -4,7 +4,7 @@ namespace app\money\admin;
 
 use app\admin\controller\Admin;
 use app\common\builder\ZBuilder;
-use app\esop\model\Plan as PlanModel;
+use app\money\model\EsopPlan as EsopPlanModel;
 use think\Db;
 use think\Hook; 
 use think\Cache;
@@ -13,7 +13,7 @@ use think\Cache;
  * 期权计划管理控制器
  * @package app\money\admin
  */
-class Index extends Admin
+class Esopplan extends Admin
 {
     /**
      * 首页
@@ -27,7 +27,7 @@ class Index extends Admin
         $order = $this->getOrder(); 
         empty($order) && $order = 'id desc';
         // 数据列表
-        $data_list = PlanModel::getAll($map, $order);
+        $data_list = EsopPlanModel::getAll($map, $order);
        // 分页数据 
         $page = $data_list->render();
 
@@ -76,7 +76,7 @@ class Index extends Admin
         $order = $this->getOrder();
         empty($order) && $order = 'id desc';
         // 数据列表
-        $xlsData = PlanModel::getAll($map, $order);
+        $xlsData = EsopPlanModel::getAll($map, $order);
 
         $title="期权计划列表";
         $arrHeader = array('ID','手机号','姓名','股票','可用期权','期权总值','待释放', '已释放','总释放天数', '已释放天数','开始释放时间', '创建时间', '状态');
@@ -95,8 +95,8 @@ class Index extends Admin
         	$value *= 100;
         }
         
-        $mid  = PlanModel::where('id', $id)->value('mid');
-        $old_value  = PlanModel::where('id', $id)->value($field);
+        $mid  = EsopPlanModel::where('id', $id)->value('mid');
+        $old_value  = EsopPlanModel::where('id', $id)->value($field);
         $mobile = Db('member')->where('id',$mid)->value('mobile');
         $details = $mobile.' 字段(' . $field . ')，原值：('.$old_value.')新值：(' . $value . ')';
 

application/esop/model/Plan.php → application/money/model/EsopPlan.php

 <?php
-    namespace app\esop\model;
+    namespace app\money\model;
     use think\helper\Hash;
     use app\money\model\Role as RoleModel;
     use think\model;
     use think\Db;
     
-    class Plan extends Model
+    class EsopPlan extends Model
     {
         
         // 设置当前模型对应的完整数据表名称