commit

.idea/workspace.xml

@@ -6,11 +6,8 @@
   <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/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" />
+      <change beforePath="$PROJECT_DIR$/app/admin/controller/user/UserAuth.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/user/UserAuth.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/api/controller/user/UserController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/api/controller/user/UserController.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -147,7 +144,11 @@
       <workItem from="1657326818073" duration="7198000" />
       <workItem from="1657500150633" duration="15662000" />
       <workItem from="1657585871651" duration="5188000" />
-      <workItem from="1657702424160" duration="984000" />
+      <workItem from="1657702424160" duration="2013000" />
+      <workItem from="1657758526690" duration="2228000" />
+      <workItem from="1657845400841" duration="2898000" />
+      <workItem from="1657931803924" duration="1186000" />
+      <workItem from="1658104473401" duration="5332000" />
     </task>
     <task id="LOCAL-00001" summary="commit">
       <created>1655962607195</created>
@@ -226,7 +227,14 @@
       <option name="project" value="LOCAL" />
       <updated>1657509884142</updated>
     </task>
-    <option name="localTasksCounter" value="12" />
+    <task id="LOCAL-00012" summary="commit">
+      <created>1657703426015</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1657703426015</updated>
+    </task>
+    <option name="localTasksCounter" value="13" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

app/admin/controller/user/UserAuth.php

@@ -75,10 +75,10 @@ class UserAuth extends AuthController
 			if($res1['is_auth']==2||$res1['is_auth']==3){
 				 return JsonService::fail('该信息已审核！不可操作');
 			}
-			$res=UserModel::where(['uid' => $uid])->update(['is_auth' =>2,'f_integral'=>3000,'off'=>"", 'is_new' => 1]);
+			$res=UserModel::where(['uid' => $uid])->update(['is_auth' =>2,'off'=>"", 'is_new' => 1]);
 			if($res>0){
 				// 添加积分充值记录
-				$res2=UserBillAdmin::income('实名认证赠送',$uid, 'integral', 'top_add', 3000, 0, 3000, '首次实名赠送(竞拍消费满30000释放)');
+//				$res2=UserBillAdmin::income('实名认证赠送',$uid, 'integral', 'top_add', 3000, 0, 3000, '首次实名赠送(竞拍消费满30000释放)');
 				return JsonService::successful('审核成功');
 				
 			}else{

app/api/controller/user/UserController.php

@@ -58,21 +58,31 @@ class UserController
         $info['commissionCount'] = bcsub($info['brokerage_price'], $info['broken_commission'], 2);
         if ($info['commissionCount'] < 0)
             $info['commissionCount'] = 0;
-//        $buy = AuctionOrder::where([['status', '=', 3], ['uid', '=', $request->uid()]])->sum('price');// 购买商品总额
-//        $sell = AuctionOrder::where([['status', '=', 3], ['collection_id', '=', $request->uid()]])->sum('price');// 出售商品总额
-        $sell = UserBill::where('uid', $info['uid'])->where('type', 'gs_integral')->sum('number');
         $level = UserLevel::where('id', $info['level'])->find();
         $info['level_name'] = $level['name']? $level['name'] : '会员';
-        if ($sell){
-            $info['profit'] = bcmul($sell, 2, 2);
-        }else{
-            $info['profit'] = 0; // 收益
-        }
+        $info['profit'] = $this->profit($info['uid']);
         $info['green'] = $info['is_new'] == 1? 1: $info['green_time'] >= strtotime(date('Y-m-d', time()))? 1 :0;
 
 
         return app('json')->success($info);
     }
+
+    public function profit($uid)
+    {
+        $order = AuctionOrder::alias('a')
+            ->field('a.*,b.rise,b.deduct')
+            ->leftJoin('auction_product b', 'a.product_id = b.id')
+            ->where('status', 3)
+            ->where('a.uid', $uid)
+            ->select();
+        $profit = 0;
+        if (count($order) > 0){
+            foreach ($order as $item) {
+                $profit += ($item['price'] * $item['rise']/100) - ($item['price'] * $item['deduct']/100);
+            }
+        }
+        return $profit;
+    }
     /**
      * 实名信息提交认证
      * @param Request $request