commit

.idea/workspace.xml

@@ -6,10 +6,11 @@
   <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/admin/view/auction/auction/fz.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/view/auction/auction/fz.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/admin/view/auction/auction/product_create.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/view/auction/auction/product_create.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/admin/view/auction/auction_product/create.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/view/auction/auction_product/create.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/admin/view/auction/auction_product/fz.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/view/auction/auction_product/fz.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/admin/model/finance/FinanceModel.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/model/finance/FinanceModel.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/api/controller/AuthController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/api/controller/AuthController.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/api/controller/PublicController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/api/controller/PublicController.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$/route/api/route.php" beforeDir="false" afterPath="$PROJECT_DIR$/route/api/route.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -144,7 +145,9 @@
       <workItem from="1657240542957" duration="117000" />
       <workItem from="1657247426337" duration="7039000" />
       <workItem from="1657326818073" duration="7198000" />
-      <workItem from="1657500150633" duration="9030000" />
+      <workItem from="1657500150633" duration="15662000" />
+      <workItem from="1657585871651" duration="5188000" />
+      <workItem from="1657702424160" duration="984000" />
     </task>
     <task id="LOCAL-00001" summary="commit">
       <created>1655962607195</created>
@@ -216,7 +219,14 @@
       <option name="project" value="LOCAL" />
       <updated>1657507871569</updated>
     </task>
-    <option name="localTasksCounter" value="11" />
+    <task id="LOCAL-00011" summary="commit">
+      <created>1657509884142</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1657509884142</updated>
+    </task>
+    <option name="localTasksCounter" value="12" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

app/admin/model/finance/FinanceModel.php

@@ -72,7 +72,7 @@ class FinanceModel extends BaseModel
     {
         $whereModel = self::setWhereList($where);
         $data = ($data = $whereModel->page((int)$where['page'], (int)$where['limit'])->select()) && count($data) ? $data->toArray() : [];
-        $count = self::count();
+        $count = self::where('category', '<>', 'integral')->count();
         return compact('data', 'count');
     }
 

app/api/controller/AuthController.php

@@ -423,7 +423,7 @@ class AuthController
         $userPhone = $userInfo->phone;
         if (!$userInfo) return app('json')->fail('用户不存在');
         if ($userInfo->phone) return app('json')->fail('您的账号已经绑定过手机号码！');
-        if (User::where('phone', $phone)->where('user_type', '<>', 'h5')->count())
+        if (User::where('phone', $phone)->count())
             return app('json')->fail('此手机已经绑定，无法多次绑定！');
         if (User::where('account', $phone)->where('phone', $phone)->where('user_type', 'h5')->find()) {
             if (!$step) return app('json')->success('H5已有账号是否绑定此账号上', ['is_bind' => 1]);

app/api/controller/PublicController.php

@@ -339,4 +339,27 @@ class PublicController
         return app('json')->successful($data);
     }
 
+    /**
+     * 版本更新
+     * @param Request $request
+     * @return void
+     */
+    public function version(Request $request)
+    {
+        $config = SystemConfigService::more(['version', 'apk','ios_version', 'ios_app']);
+        $data = [
+            'version' => $config['version'],
+            'url' =>   $request->domain().'/'.$config['apk'],
+            'ios_version' => $config['ios_version'],
+            'ios_url' =>   $request->domain().'/'.$config['ios_app']
+        ];
+        $msg = [
+            'status' => 200,
+            'msg' => 'ok',
+            'data' => $data
+        ];
+        return json_encode($msg, JSON_UNESCAPED_SLASHES);
+
+    }
+
 }

app/models/auction/AuctionOrder.php

@@ -199,7 +199,7 @@ class AuctionOrder extends BaseModel
 //        $user['anticipate'] = $user['anticipate']-$price*($product['deduct']/100); // 扣除当前卖出价格百分比的广告值
 //        $user->save();
 //        UserBill::expend('广告值扣除', $user['uid'], 'anticipate','reduce_anticipate', $price*($product['deduct']/100), 0, $user['anticipate'] ,'卖出扣除广告值');
-        AuctionTime::where([['product_id', '=', $product['id']], ['uid', '=', $id]])->delete();
+        AuctionTime::where([['product_id', '=', $product['id']]])->delete();
         $productModel->where('id', $product['id'])->save(['is_show' => 0]); //下架等待挂售
 
     }
@@ -214,7 +214,7 @@ class AuctionOrder extends BaseModel
      */
     public static function return($order)
     {
-        $data = self::find($order['id']);
+        $data = self::find($order);
         $userModel = new User();
         $productModel = new AuctionProduct();
         $auctionModel = new Auction();
@@ -222,17 +222,14 @@ class AuctionOrder extends BaseModel
         $frozenModel = new AuctionFrozen();
 
 
-        $user = $userModel->find($data['uid']);
-//        if ($user['is_new'] == 1) {
-//
-//            if ($user['spread_uid']) {
-//                $spread = $userModel->where('uid', $user['spread_uid'])->find();
-//                $proportion = SystemConfigService::get('golden_bean')/100;
-//                $spread['golden_bean'] += $order['price'] * $proportion;
-//                $spread->save();
-//                \app\models\user\UserBill::income('直推奖励金豆', $spread['uid'], 'golden_bean', 'ztjl_golden_bean', $order['price'] * $proportion, '', $spread['golden_bean'], '直推奖励金豆');
-//            }
-//        }
+        $user = \app\models\user\User::where('uid', $data['uid'])->find();
+        if ($user['spread_uid']) {
+            $spread = $userModel->where('uid', $user['spread_uid'])->find();
+            $proportion = SystemConfigService::get('golden_bean')/100;
+            $spread['golden_bean'] += $data['price'] * $proportion;
+            $spread->save();
+            \app\models\user\UserBill::income('直推奖励金豆', $spread['uid'], 'golden_bean', 'ztjl_golden_bean', $data['price'] * $proportion, '', $spread['golden_bean'], '直推奖励金豆');
+        }
         $product = $productModel->where('id', $data['product_id'])->find();
         $auction = $auctionModel->where('id', $product['auction_id'])->find();
 

route/api/route.php

@@ -276,6 +276,7 @@ Route::group(function () {
 
 
     Route::get('auction_list', 'auction.auctionController/list')->name('auction');//场馆数据
+    Route::get('version', 'PublicController/version')->name('version'); // 版本更新
 
 })->middleware(\app\http\middleware\AllowOriginMiddleware::class)->middleware(\app\http\middleware\AuthTokenMiddleware::class, false);