commit

.idea/workspace.xml

@@ -6,12 +6,14 @@
   <component name="ChangeListManager">
     <list default="true" id="9df7b838-09db-466a-bed4-3e1ac8c3624d" name="变更" comment="commit">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/api/controller/auction/AuctionController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/api/controller/auction/AuctionController.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/api/controller/auction/AuctionOrderController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/api/controller/auction/AuctionOrderController.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/api/controller/auction/AuctionProductController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/api/controller/auction/AuctionProductController.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/http/middleware/AllowOriginMiddleware.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/http/middleware/AllowOriginMiddleware.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/models/auction/AuctionOrder.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/models/auction/AuctionOrder.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/api/controller/user/UserBillController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/api/controller/user/UserBillController.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/models/user/UserBill.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/models/user/UserBill.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/public/index/static/js/index.4b0b0b40.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/index/static/js/index.4b0b0b40.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/public/index/static/js/index.7cef0702.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/index/static/js/index.7cef0702.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/public/index/static/js/index.86056633.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/index/static/js/index.86056633.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/public/index/static/js/index.a73fb3d8.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/index/static/js/index.a73fb3d8.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/route/api/route.php" beforeDir="false" afterPath="$PROJECT_DIR$/route/api/route.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/runtime/admin/temp/c8a377f88d51e369115354584107e9f4.php" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/admin/temp/c8a377f88d51e369115354584107e9f4.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/runtime/cache/a9/939d920c0fa6b4fe0b897fb019672a.php" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/cache/a9/939d920c0fa6b4fe0b897fb019672a.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -113,7 +115,7 @@
       <option name="presentableId" value="Default" />
       <updated>1655946296572</updated>
       <workItem from="1655946298157" duration="4390000" />
-      <workItem from="1655962099358" duration="7750000" />
+      <workItem from="1655962099358" duration="9509000" />
     </task>
     <task id="LOCAL-00001" summary="commit">
       <created>1655962607195</created>
@@ -122,7 +124,14 @@
       <option name="project" value="LOCAL" />
       <updated>1655962607195</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary="commit">
+      <created>1655970001449</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1655970001449</updated>
+    </task>
+    <option name="localTasksCounter" value="3" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

app/api/controller/user/UserBillController.php

@@ -352,10 +352,10 @@ class UserBillController
      */
     public function integral_list(Request $request)
     {
-        list($page, $limit) = UtilService::getMore([
-            [['page', 'd'], 0], [['limit', 'd'], 0]
+        list($page, $limit, $status) = UtilService::getMore([
+            ['page', 0], ['limit', 0], ['pm', 0]
         ], $request, true);
-        return app('json')->successful(UserBill::userBillList($request->uid(), $page, $limit));
+        return app('json')->successful(UserBill::userBillList($request->uid(), $page, $limit, 'integral', ['pm' => $status]));
 
     }
     /**
@@ -368,10 +368,44 @@ class UserBillController
      */
     public function anticipate_list(Request $request)
     {
-        list($page, $limit) = UtilService::getMore([
-            [['page', 'd'], 0], [['limit', 'd'], 0]
+        list($page, $limit, $status) = UtilService::getMore([
+            ['page', 0], ['limit', 0], ['pm', 0]
+        ], $request, true);
+        return app('json')->successful(UserBill::userBillList($request->uid(), $page, $limit, 'anticipate', ['pm' => $status]));
+
+    }
+
+    /**
+     * 金豆记录
+     * @param Request $request
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function golden_bean_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, 'golden_bean', ['pm' => $status]));
+
+    }
+
+    /**
+     * 购物券记录
+     * @param Request $request
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function shop_integral_list(Request $request)
+    {
+        list($page, $limit, $status) = UtilService::getMore([
+            ['page', 0], ['limit', 0], ['pm', 0]
         ], $request, true);
-        return app('json')->successful(UserBill::userAnticipate($request->uid(), $page, $limit));
+        return app('json')->successful(UserBill::userBillList($request->uid(), $page, $limit, 'shop_integral', ['pm' => $status]));
 
     }
 }

app/models/user/UserBill.php

@@ -59,13 +59,14 @@ class UserBill extends BaseModel
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public static function userBillList($uid, $page, $limit, $category = 'integral')
+    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();
@@ -74,75 +75,23 @@ class UserBill extends BaseModel
                 ->where('category', $category)
                 ->field('mark,pm,number,add_time')
                 ->where('status', 1)
+                ->where($where)
                 ->order('add_time DESC')
                 ->select();
         }
-        $data['zj'] = [];
-        $data['kc'] = [];
-        $list = count($list) ? $list->toArray() : [];
-        foreach ($list as &$v) {
+        $data['list'] = count($list) ? $list->toArray() : [];
+        $data['zc'] = self::where('uid', $uid)->where('category', $category)->where('pm', 0)->sum('number');
+        $data['sr'] = self::where('uid', $uid)->where('category', $category)->where('pm', 1)->sum('number');
+        foreach ($data['list'] as &$v) {
             $v['add_time'] = date('Y/m/d H:i', $v['add_time']);
             $v['number'] = floatval($v['number']);
-            if ($v['pm'] == 1) $data['zj'][] = $v;
-            if ($v['pm'] == 0) $data['kc'][] = $v;
         }
-        return $data;
-    }
-
-    /**
-     * 广告值
-     * @param $uid
-     * @param $page
-     * @param $limit
-     * @param string $category
-     * @return array|\think\Collection
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    public static function userAnticipate($uid, $page, $limit, $category = 'anticipate')
-    {
-        if ($page) {
-            $list = self::where('uid', $uid)
-                ->where('category', $category)
-                ->field('mark,pm,number,add_time')
-                ->where('status', 1)
-                ->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)
-                ->order('add_time DESC')
-                ->select();
-        }
-        $data['zj'] = [];
-        $data['kc'] = [];
-        $data['sr'] = 0;
-        $data['zc'] = 0;
-        $data['data'] = [];
-        $data['data'] = count($list) ? $list->toArray() : [];
-        foreach ($data['data'] as &$v) {
-            $v['add_time'] = date('Y/m/d H:i', $v['add_time']);
-            $v['number'] = floatval($v['number']);
-            if ($v['pm'] == 1) {
-                $data['sr'] += $v['number'];
-                $data['zj'][] = $v;
-            }
-            if ($v['pm'] == 0){
-                $data['zc'] += $v['number'];
-                $data['kc'][] = $v;
-            }
 
-        }
-        $data['sr'] = round($data['sr'], 2);
-        $data['zc'] = round($data['zc'], 2);
-        return $data;
+        return  $data;
     }
 
-    /**
+
+        /**
      * 获取昨日佣金
      * @param $uid
      * @return float

route/api/route.php

@@ -147,7 +147,9 @@ Route::group(function () {
     Route::get('spread/count/:type', 'user.UserBillController/spread_count')->name('spreadCount');//推广 佣金 3/提现 4 总和
     Route::get('spread/banner', 'user.UserBillController/spread_banner')->name('spreadBanner');//推广分销二维码海报生成
     Route::get('integral/list', 'user.UserBillController/integral_list')->name('integralList');//积分记录
+    Route::get('golden_bean_list/list', 'user.UserBillController/golden_bean_list')->name('golden_bean_list');//金豆记录
     Route::get('anticipate/list', 'user.UserBillController/anticipate_list')->name('anticipate');//预约券记录
+    Route::get('shop_integral_list/list', 'user.UserBillController/shop_integral_list')->name('shop_integral_list');//购物券记录
     //提现类
     Route::get('extract/bank', 'user.UserExtractController/bank')->name('extractBank');//提现银行/提现最低金额
     Route::post('extract/cash', 'user.UserExtractController/cash')->name('extractCash');//提现申请

runtime/admin/temp/c8a377f88d51e369115354584107e9f4.php

@@ -1,11 +1,11 @@
-<?php /*a:1:{s:59:"D:\phpstudy_pro\WWW\newQudou\app\admin\view\login\index.php";i:1648971704;}*/ ?>
+<?php /*a:1:{s:59:"D:\phpstudy_pro\WWW\newQudou\app\admin\view\login\index.php";i:1655950041;}*/ ?>
 <!DOCTYPE html>
 <html>
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="robots" content="noindex,nofollow" />
-    <title>易趣GO!</title>
+    <title>嗨易趣!</title>
     <meta name="generator" content="CRMEB! v2.5" />
     <meta name="author" content="CRMEB! Team and CRMEB UI Team" />
     <link href="/system/frame/css/bootstrap.min.css?v=3.4.0" rel="stylesheet">
@@ -50,7 +50,7 @@
     </div>
 </div>
 <div class="footer" style=" position: fixed;bottom: 0;width: 100%;left: 0;margin: 0;opacity: 0.8;">
-    <div class="pull-right">© 2017-2021 <a href="http://www.crmeb.com/" target="_blank">易趣GO</a>
+    <div class="pull-right">© 2017-2021 <a href="http://www.crmeb.com/" target="_blank">嗨易趣</a>
     </div>
 </div>
 

runtime/cache/a9/939d920c0fa6b4fe0b897fb019672a.php

@@ -1,4 +1,4 @@
 <?php
 //000000000000
  exit();?>
-a:10:{i:0;s:80:"D:\phpstudy_pro\WWW\newQudou\runtime\cache\48\e345b986ae9584f9686dac64ea2c6a.php";i:1;s:80:"D:\phpstudy_pro\WWW\newQudou\runtime\cache\59\62ccd748530d5866ded674e0247788.php";i:2;s:80:"D:\phpstudy_pro\WWW\newQudou\runtime\cache\4d\ebc178cbdb9b7d1fc736ef8ee65e51.php";i:3;s:80:"D:\phpstudy_pro\WWW\newQudou\runtime\cache\b6\2c1e2a759fad26f36b6705aeb096e7.php";i:4;s:80:"D:\phpstudy_pro\WWW\newQudou\runtime\cache\3a\18e85fda2f43f200f015f30d0af45e.php";i:5;s:80:"D:\phpstudy_pro\WWW\newQudou\runtime\cache\a7\53d3226685fd31b029614775beb88c.php";i:6;s:80:"D:\phpstudy_pro\WWW\newQudou\runtime\cache\57\e5830fa228be4a7d40bf40abfb7a18.php";i:7;s:80:"D:\phpstudy_pro\WWW\newQudou\runtime\cache\e0\f15cee86afad4eabb0d5176f63c302.php";i:8;s:80:"D:\phpstudy_pro\WWW\newQudou\runtime\cache\a6\d6181cf79cbad4a232ed9006617c00.php";i:9;s:80:"D:\phpstudy_pro\WWW\newQudou\runtime\cache\2b\8b07b35c908c382a8aae9b52863147.php";}
+a:11:{i:0;s:80:"D:\phpstudy_pro\WWW\newQudou\runtime\cache\48\e345b986ae9584f9686dac64ea2c6a.php";i:1;s:80:"D:\phpstudy_pro\WWW\newQudou\runtime\cache\59\62ccd748530d5866ded674e0247788.php";i:2;s:80:"D:\phpstudy_pro\WWW\newQudou\runtime\cache\4d\ebc178cbdb9b7d1fc736ef8ee65e51.php";i:3;s:80:"D:\phpstudy_pro\WWW\newQudou\runtime\cache\b6\2c1e2a759fad26f36b6705aeb096e7.php";i:4;s:80:"D:\phpstudy_pro\WWW\newQudou\runtime\cache\3a\18e85fda2f43f200f015f30d0af45e.php";i:5;s:80:"D:\phpstudy_pro\WWW\newQudou\runtime\cache\a7\53d3226685fd31b029614775beb88c.php";i:6;s:80:"D:\phpstudy_pro\WWW\newQudou\runtime\cache\57\e5830fa228be4a7d40bf40abfb7a18.php";i:7;s:80:"D:\phpstudy_pro\WWW\newQudou\runtime\cache\e0\f15cee86afad4eabb0d5176f63c302.php";i:8;s:80:"D:\phpstudy_pro\WWW\newQudou\runtime\cache\a6\d6181cf79cbad4a232ed9006617c00.php";i:9;s:80:"D:\phpstudy_pro\WWW\newQudou\runtime\cache\2b\8b07b35c908c382a8aae9b52863147.php";i:10;s:80:"D:\phpstudy_pro\WWW\newQudou\runtime\cache\b0\0eb913440b871528ef5387cdfe695b.php";}