修改接口

@@ -21,7 +21,7 @@ class Student extends Model
     // 定义时间戳字段名
     protected $createTime = 'createtime';
     protected $updateTime = 'updatetime';
-    protected $deleteTime = 'deletetime';
+    protected $deleteTime = false;
 
     // 追加属性
     protected $append = [

@@ -20,7 +20,7 @@
 <!--                            </ul>-->
 <!--                        </div>-->
 
-                        <a class="btn btn-success btn-recyclebin btn-dialog {:$auth->check('student/recyclebin')?'':'hide'}" href="student/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>
+                        <!--<a class="btn btn-success btn-recyclebin btn-dialog {:$auth->check('student/recyclebin')?'':'hide'}" href="student/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>-->
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
                            data-operate-edit="{:$auth->check('student/edit')}" 

@@ -13,7 +13,7 @@ function handleOrder($orderInfo) {
             }
             $insertData = [
                 'user_id' => $orderInfo['other']['user_id'],
-                'money' => $orderInfo['other']['money'],
+                'money' => $orderInfo['money'],
                 'memo' => '收到打赏',
                 'createtime' => time(),
             ];
@@ -24,7 +24,7 @@ function handleOrder($orderInfo) {
             }
 
             $updateData = [
-                'money' => bcadd($userInfo['money'], $orderInfo['other']['money'], 2)
+                'money' => bcadd($userInfo['money'], $orderInfo['money'], 2)
             ];
             $res = $user->updateOne($orderInfo['other']['user_id'], $updateData);
             if(!$res) {
@@ -32,16 +32,32 @@ function handleOrder($orderInfo) {
             }
             return true;
         } elseif ($orderInfo['type'] == 2) { // 购买vip
+
             $student = new \app\api\model\Student();
             $studentInfo = $student->infoByUserIdCanShow($orderInfo['other']['user_id']);
             if(!$student) {
                 return false;
             }
 
+            //添加明细
+            $insertData = [
+                'user_id' => $orderInfo['other']['user_id'],
+                'money' => $orderInfo['money'],
+                'memo' => '购买VIP',
+                'createtime' => time()
+            ];
+
             if($studentInfo['vip_endtime']) {
                 if($studentInfo['vip_level'] == $orderInfo['other']['vip_level']) {
                     if($studentInfo['vip_endtime'] >= time()) {
                         $vipEndTime = bcadd($studentInfo['vip_endtime'], bcmul($orderInfo['other']['keep'], bcmul(3600, 24, 0), 0), 0);
+                        //添加明细
+                        $insertData = [
+                            'user_id' => $orderInfo['other']['user_id'],
+                            'money' => $orderInfo['money'],
+                            'memo' => '续费VIP',
+                            'createtime' => time()
+                        ];
                     } else {
                         $vipEndTime = bcadd(bcmul($orderInfo['other']['keep'], bcmul(3600, 24, 0), 0), time(), 0);
                     }
@@ -51,13 +67,7 @@ function handleOrder($orderInfo) {
             } else {
                 $vipEndTime = bcadd(bcmul($orderInfo['other']['keep'], bcmul(3600, 24, 0), 0), time(), 0);
             }
-            //添加明细
-            $insertData = [
-                'user_id' => $orderInfo['other']['user_id'],
-                'money' => $orderInfo['other']['money'],
-                'memo' => '购买VIP',
-                'createtime' => time()
-            ];
+
             $userMoneyLog = new \app\api\model\UserMoneyLog();
             $res1 = $userMoneyLog->addOne($insertData);
 
@@ -66,6 +76,7 @@ function handleOrder($orderInfo) {
                 'vip_endtime' => $vipEndTime,
             ];
             $res = $student->updateOne($studentInfo['user_id'], $updateData);
+
             if(!$res) {
                 return false;
             }

@@ -23,21 +23,21 @@ class Student extends Model
     // 获取高中同校的本校学长总数
     public function countByUniversityIdAndSchoolId($universityId, $schoolId)
     {
-        return $this->where(['university_id' => ['=', $universityId], 'show_switch' => ['=', 1], 'school_id' => ['=', $schoolId]])->useSoftDelete($this->deleteTime)->count();
+        return $this->where(['university_id' => ['=', $universityId], 'show_switch' => ['=', 1], 'school_id' => ['=', $schoolId]])->count();
     }
 
     // 获取高中同城/省的本校学长总数
     public  function countByUniversityIdAndSchoolIds($universityId, $schoolIds)
     {
-        return $this->where(['university_id' => ['=', $universityId], 'show_switch' => ['=', 1], 'school_id' => ['in', $schoolIds]])->useSoftDelete($this->deleteTime)->count();
+        return $this->where(['university_id' => ['=', $universityId], 'show_switch' => ['=', 1], 'school_id' => ['in', $schoolIds]])->count();
     }
 
     // 根据用户ID获取一个可以展示的学生的数据
     public function infoByUserIdCanShow($userId)
     {
         return $this
-            ->where(['user_id' => ['=', $userId]])
-            ->useSoftDelete($this->deleteTime)
+            ->where(['user_id' => ['eq', $userId]])
+//            ->useSoftDelete($this->deleteTime)
             ->find();
     }
 
@@ -46,7 +46,6 @@ class Student extends Model
     {
         return $this
             ->where($where)
-            ->useSoftDelete($this->deleteTime)
             ->order($this->createTime, 'desc')
             ->page($page, $size)
             ->select();