财务审核, 提现信息

modules/Jiesuan/Http/Controllers/FinanceCheckController.php

@@ -110,4 +110,20 @@ class FinanceCheckController extends CatchController
         return 'ok';
     }
 
+    /**
+     * 商户的账户余额信息
+     * @param Request $request
+     * @return object|null
+     * @throws \Illuminate\Validation\ValidationException
+     */
+    public function getShanghuAccountInfo(Request $request) {
+        $this->validate($request, [
+            'company_uid' => 'required'
+        ]);
+
+        $accountInfo = CompanyUserMoneyService::userMoneyInfo($request->input('company_uid'));
+        $accountInfo->total_jiesuan = bcsub($accountInfo->total_income,  $accountInfo->total_tuikuan, 2);
+
+        return $accountInfo;
+    }
 }

modules/Jiesuan/Http/Controllers/JiesuanController.php

@@ -27,7 +27,7 @@ class JiesuanController extends CatchController
         $isExport = $request->input('is_export', 0);
         $sql = DB::table('jiesuan_records')
             ->where([
-                'company_uid' => $this->getLoginUserId(),
+                'company_uid' => $this->getCompanyUid($request),
             ])->when($jiesuanDateStartAt, function ($query, $jiesuanDateStartAt) {
                 return $query->where('jiesuan_date', '>=', $jiesuanDateStartAt);
             })
@@ -99,18 +99,25 @@ class JiesuanController extends CatchController
      * @param Request $request
      */
     public function listTixian(Request $request) {
-        $company_uid = $this->getLoginUserId();
+        $company_uid = $this->getCompanyUid($request);
         $this->validate($request, [
             'status' => 'nullable|integer|in:1,2,3,4,5'
         ]);
         $status = $request->input('status');
         $isExport = $request->input('is_export');
+        $tixianStartAt = $request->input('tixian_start_at');
+        $tixianEndAt = $request->input('tixian_end_at');
         $sql = DB::table('tixian_records')
             ->where([
                 'company_uid' => $company_uid,
             ])->when($status, function ($query, $status){
                 return $query->where('status', $status);
-            })->orderBy('id', 'desc');
+            })->when($tixianStartAt, function ($query, $tixianStartAt) {
+                return $query->where('created_at', '>=', $tixianStartAt);
+            })->when($tixianEndAt, function ($query, $tixianEndAt) {
+                return $query->where('created_at', '<=', $tixianEndAt. ' 23:59:59');
+            })
+            ->orderBy('id', 'desc');
         if($isExport) {
             $result = $sql->get();
         } else {
@@ -122,5 +129,12 @@ class JiesuanController extends CatchController
         return $result;
     }
 
+    private function getCompanyUid(Request $request) {
+        if($this->isOptimizer()) {
+            return $this->getOptimizerUid();
+        } else {
+            return $request->input('company_uid');
+        }
+    }
 
 }

modules/User/Http/Controllers/UserTrait.php

@@ -76,11 +76,22 @@ trait UserTrait
         return compact('loginUser', 'loginUserRoles', 'operateUserRoles', 'operateUser');
     }
 
+    /**
+     * 获取优化师用户uid
+     * @return int|null
+     */
     public function getOptimizerUid() {
-        $currentUserRoles = $this->listUserRoles();
-        if($currentUserRoles->contains('optimizer')) {
+        if($this->isOptimizer()) {
             return $this->getCurrentUser()->id;
         }
         return null;
     }
+
+    /**
+     * 是否是优化师
+     * @return bool
+     */
+    public function isOptimizer() {
+        return $this->listUserRoles()->contains('optimizer');
+    }
 }

tests/Jiesuan/Http/Controllers/FinanceCheckControllerTest.php

@@ -14,9 +14,11 @@ class FinanceCheckControllerTest extends UsedTestCase
         $res = $this->withHeaders([
             'Authorization' => 'Bearer '. $this->token,
         ])->json('get','http://localhost/api/jiesuanManage/financeCheck/list',[
-            'status' => 2
+            'status' => 4,
+//            'owner_name' => 'fsd1'
         ]);
-        $res->dump();
+//        $res->dump();
+        $this->dumpJson($res);
     }
     public function testCheck()
     {