commit

app/api/controller/user/UserBillController.php

@@ -358,4 +358,39 @@ class UserBillController
         return app('json')->successful(UserBill::userBillList($request->uid(), $page, $limit, 'integral', ['pm' => $status]));
 
     }
+
+
+    /**
+     * 积分记录
+     * @param Request $request
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function now_money_list(Request $request)
+    {
+        list($page, $limit, $status) = UtilService::getMore([
+            ['page', 0], ['limit', 0], ['pm', 0]
+        ], $request, true);
+        return app('json')->successful(UserBill::userBillList($request->uid(), $page, $limit, 'now_money', ['pm' => $status]));
+
+    }
+
+    /**
+     * 积分记录
+     * @param Request $request
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function brokerage_list(Request $request)
+    {
+        list($page, $limit, $status) = UtilService::getMore([
+            ['page', 0], ['limit', 0], ['pm', 0]
+        ], $request, true);
+        return app('json')->successful(UserBill::userBillList($request->uid(), $page, $limit, 'brokerage', ['pm' => $status]));
+
+    }
 }

app/models/user/UserBill.php

@@ -61,30 +61,64 @@ class UserBill extends BaseModel
      */
     public static function userBillList($uid, $page, $limit, $category = 'integral', $where = [])
     {
-        if ($page) {
-            $list = self::where('uid', $uid)
-                ->where('category', $category)
-                ->field('mark,pm,number,add_time')
-                ->where('status', 1)
-                ->where($where)
-                ->order('add_time DESC')
-                ->page((int)$page, (int)$limit)
-                ->select();
-        } else {
-            $list = self::where('uid', $uid)
-                ->where('category', $category)
-                ->field('mark,pm,number,add_time')
-                ->where('status', 1)
-                ->where($where)
-                ->order('add_time DESC')
-                ->select();
-        }
-        $list = count($list) ? $list->toArray() : [];
-        foreach ($list as &$v) {
-            $v['add_time'] = date('Y/m/d H:i', $v['add_time']);
-            $v['number'] = floatval($v['number']);
+        if ($category == 'brokerage'){
+            if ($page) {
+                $list = self::where('uid', $uid)
+                    ->where('category', 'now_money')
+                    ->where('type', 'in','brokerage')
+                    ->field('mark,pm,number,add_time')
+                    ->where('status', 1)
+                    ->where($where)
+                    ->order('add_time DESC')
+                    ->page((int)$page, (int)$limit)
+                    ->select();
+            } else {
+                $list = self::where('uid', $uid)
+                    ->where('category', 'now_money')
+                    ->where('category', 'in','extract')
+                    ->field('mark,pm,number,add_time')
+                    ->where('status', 1)
+                    ->where($where)
+                    ->order('add_time DESC')
+                    ->select();
+            }
+            $data['zc'] = self::where('uid', $uid)->where('category', 'now_money')->where('type', 'extract')->where('pm', 0)->sum('number');
+            $data['sr'] = self::where('uid', $uid)->where('category', 'now_money')->where('type', 'brokerage')->where('pm', 1)->sum('number');
+            $data['list'] = count($list) ? $list->toArray() : [];
+            foreach ($data['list'] as &$v) {
+                $v['add_time'] = date('Y/m/d H:i', $v['add_time']);
+                $v['number'] = floatval($v['number']);
+            }
+
+        }else{
+            if ($page) {
+                $list = self::where('uid', $uid)
+                    ->where('category', $category)
+                    ->where('type', 'notIn', 'brokerage,extract')
+                    ->field('mark,pm,number,add_time')
+                    ->where('status', 1)
+                    ->where($where)
+                    ->order('add_time DESC')
+                    ->page((int)$page, (int)$limit)
+                    ->select();
+            } else {
+                $list = self::where('uid', $uid)
+                    ->where('category', $category)
+                    ->where('category', 'notIn','extract')
+                    ->field('mark,pm,number,add_time')
+                    ->where('status', 1)
+                    ->where($where)
+                    ->order('add_time DESC')
+                    ->select();
+            }
+            $data['zc'] = self::where('uid', $uid)->where('category', $category)->where('type', 'notIn', 'extract')->where('pm', 0)->sum('number');
+            $data['sr'] = self::where('uid', $uid)->where('category', $category)->where('type', 'notIn', 'brokerage')->where('pm', 1)->sum('number');
+            $data['list'] = count($list) ? $list->toArray() : [];
+            foreach ($data['list'] as &$v) {
+                $v['add_time'] = date('Y/m/d H:i', $v['add_time']);
+                $v['number'] = floatval($v['number']);
+            }
         }
-        return $list;
     }
 
     /**