Merge branch 'test' of 121.36.198.49:zy_duanju/duanju_manage into test

modules/Callback/Http/Controllers/CallbackLogController.php

@@ -27,6 +27,7 @@ class CallbackLogController extends CatchController
         $userRanseStartAtEndTime = $request->input('user_ranse_start_at_end_time');
         $orderCreatedAtBeginTime = $request->input('order_created_at_begin_time');
         $orderCreatedAtEndTime = $request->input('order_created_at_end_time');
+        $miniprogramId = $request->input('miniprogram_id');
         $isExport = $request->input('is_export', false);
 
         $sql = DB::table('callback_report_charge_record')
@@ -44,7 +45,10 @@ class CallbackLogController extends CatchController
                 return $query->where('user_ranse_start_at', '<=', $userRanseStartAtEndTime);
             })->when($orderCreatedAtBeginTime, function ($query, $orderCreatedAtBeginTime){
                 return $query->where('order_created_at', '>=', $orderCreatedAtBeginTime);
-            })->when($orderCreatedAtEndTime, function ($query, $orderCreatedAtEndTime) {
+            })->when($miniprogramId, function ($query, $miniprogramId){
+                return $query->where('miniprogram_id', $miniprogramId);
+            })
+            ->when($orderCreatedAtEndTime, function ($query, $orderCreatedAtEndTime) {
                 return $query->where('order_created_at', '<=', $orderCreatedAtEndTime);
             })->orderBy('created_at', 'desc');
         if($isExport) {
@@ -66,6 +70,12 @@ class CallbackLogController extends CatchController
             if('ok' == $item->filter_type ) {
                 $item->filter_reason .= '-'. $reportSuccessStr[$item->report_success] ?? '';
             }
+
+            if('ok' == $item->filter_type && (0 != $item->report_success)) {
+                $item->filter_type_str = '成功';
+            } else {
+                $item->filter_type_str = '失败';
+            }
         }
 
         return $result;

modules/Jiesuan/Http/Controllers/BankAccountController.php

@@ -0,0 +1,122 @@
+<?php
+
+namespace Modules\Jiesuan\Http\Controllers;
+
+use Catch\Base\CatchController;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Modules\Jiesuan\Services\BusinessmanService;
+use Modules\Jiesuan\Services\ConstService;
+use Modules\User\Http\Controllers\UserTrait;
+
+
+class BankAccountController extends CatchController
+{
+    use UserTrait;
+    use ValidatesRequests;
+
+    /**
+     * 添加公司结算银行卡
+     * @param Request $request
+     */
+    public function addCompanyCard(Request $request) {
+        $this->validate($request, [
+            'owner_name' => 'required|string|max:64',
+            'name_of_payee' => 'required|string|max:128',
+            'card_no' => 'required',
+            'bank_name' => 'required|string|max:128',
+            'sub_bank_name' => 'required|string|max:256',
+            'phone_of_payee' => 'required',
+            'business_id' => 'required',
+        ]);
+
+        $company_uid = $this->getLoginUserId();
+        $id = $request->input('id');
+        $data = $request->all();
+        $now = date('Y-m-d H:i:s');
+        if($id) {
+            $data['updated_at'] = $now;
+            // 只有待审核的允许修改
+            DB::table('bank_cards')
+                ->where([
+                    'id' => $id, 'status' => 1, 'company_uid'=> $company_uid
+                ])->update($data);
+        } else {
+            $data['status'] = 1;
+            $data['updated_at'] = $data['created_at'] = $now;
+            DB::table('bank_cards')
+                ->insert($data);
+        }
+        return 'ok';
+    }
+
+    /**
+     * 商务列表
+     * @param Request $request
+     */
+    public function listShangwu(Request $request) {
+        return BusinessmanService::list();
+    }
+
+    /**
+     * 银行列表
+     * @param Request $request
+     */
+    public function listBank(Request $request) {
+        return DB::table('banks')
+            ->where(['is_show' => 1])
+            ->select('id', 'name')
+            ->get();
+    }
+
+    /**
+     * 公司银行卡列表
+     * @param Request $request
+     */
+    public function listCompanyCard(Request $request) {
+        $company_uid = $this->getLoginUserId();
+        $ownerName = $request->input('owner_name');
+        $businessId = $request->input('business_id');
+        $createStartAt = $request->input('create_start_at');
+        $createEndAt = $request->input('create_end_at');
+        $bankCards = DB::table('bank_cards')
+            ->where([
+                'company_uid' => $company_uid
+            ])->where('status', '<>', 0)
+            ->when($ownerName, function ($query, $ownerName){
+                return $query->where('owner_name', 'like', '%'. $ownerName . '%');
+            })->when($businessId, function ($query, $businessId){
+                return $query->where('business_id', $businessId);
+            })->when($createStartAt, function ($query, $createStartAt) {
+                return $query->where('created_at', '>=', $createStartAt);
+            })->when($createEndAt, function ($query, $createEndAt){
+                return $query->where('created_at', '<=', $createEndAt);
+            })
+            ->orderBy('id', 'desc')
+            ->paginate($request->input('limit', 15));
+        $businessmans = BusinessmanService::list()->keyBy('id');
+        foreach ($bankCards as $bankCard) {
+            $bankCard->status_str = ConstService::BANK_CARD_CHECK_STATUS[$bankCard->status] ?? '';
+            $bankCard->business_str = $businessmans->get($bankCard->business_id)->username ?? '';
+        }
+
+        return $bankCards;
+    }
+
+    /**
+     * 合作信息
+     * @param Request $request
+     */
+    public function hezuoInfo(Request $request) {
+        $shareRate = DB::table('company_share_rates')
+            ->whereIn('company_uid', [0, $this->getLoginUserId()])
+            ->select('company_uid', 'share_rate')
+            ->orderBy('company_uid', 'desc')
+            ->first()->share_rate  ?? '89.1';
+
+        return [
+            'share_rate' => $shareRate . '%',
+        ];
+    }
+}

modules/Jiesuan/Http/Controllers/JiesuanController.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace Modules\Jiesuan\Http\Controllers;
+
+use Catch\Base\CatchController;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Modules\User\Http\Controllers\UserTrait;
+
+class JiesuanController extends CatchController
+{
+    use UserTrait;
+    use ValidatesRequests;
+
+    /**
+     * 结算记录
+     * @param Request $request
+     */
+    public function list(Request $request) {
+        $jiesuanDateStartAt = $request->input('jiesuan_date_start_at');
+        $jiesuanDateEndAt = $request->input('jiesuan_date_end_at');
+        $isExport = $request->input('is_export', 0);
+        $sql = DB::table('jiesuan_records')
+            ->where([
+                'company_uid' => $this->getLoginUserId(),
+            ])->when($jiesuanDateStartAt, function ($query, $jiesuanDateStartAt) {
+                return $query->where('jiesuan_date', '>=', $jiesuanDateStartAt);
+            })
+            ->when($jiesuanDateEndAt, function ($query, $jiesuanDateEndAt) {
+                return $query->where('jiesuan_date', '<=', $jiesuanDateEndAt);
+            })
+            ->orderBy('jiesuan_date', 'desc')
+            ->select('id', 'jiesuan_date', 'charge_money', 'tuikuan_money', 'share_rate', 'jiesuan_money');
+        if($isExport) {
+            $results = $sql->get();
+        } else {
+            $results = $sql->paginate($request->input('limit', 15));
+        }
+
+        foreach ($results as $item) {
+            $item->share_rate .= '%';
+        }
+    }
+
+    /**
+     * 账户金额详情
+     * @param Request $request
+     */
+    public function accountInfo(Request $request) {
+        $company_uid = $this->getLoginUserId();
+        $moneyInfo = DB::table('users')
+            ->where('id', $company_uid)
+            ->select('remain_money', 'dakuan_money', 'id')
+            ->first();
+
+        $tixian_money = DB::table('tixian_records')
+            ->where('company_uid', $company_uid)
+            ->whereIn('status', [1,3])
+            ->sum('tixian_money');
+
+        $moneyInfo->tixian_money = $tixian_money;
+        return $moneyInfo;
+    }
+
+    /**
+     * 申请提现
+     * @param Request $request
+     */
+    public function tixian(Request $request) {
+        $this->validate($request, [
+            'bank_card_id' => 'required',
+            'tixian_money' => 'required|numeric|min:500'
+        ]);
+
+//        DB::table('tixian_records')
+//            ->insert()
+    }
+
+    /**
+     * 提现记录
+     * @param Request $request
+     */
+    public function listTixian(Request $request) {
+
+    }
+}

modules/Jiesuan/Installer.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Modules\ContentManage;
+
+use Catch\Support\Module\Installer as ModuleInstaller;
+use Modules\ContentManage\Providers\ContentManageServiceProvider;
+
+class Installer extends ModuleInstaller
+{
+    protected function info(): array
+    {
+        // TODO: Implement info() method.
+        return [
+            'title' => '内容中台',
+            'name' => 'contentManage',
+            'path' => 'contentManage',
+            'keywords' => '内容中台',
+            'description' => '内容中台管理模块',
+            'provider' => ContentManageServiceProvider::class
+        ];
+    }
+
+    protected function requirePackages(): void
+    {
+        // TODO: Implement requirePackages() method.
+    }
+
+    protected function removePackages(): void
+    {
+        // TODO: Implement removePackages() method.
+    }
+}

modules/Jiesuan/Providers/JiesuanServiceProvider.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Modules\Jiesuan\Providers;
+
+use Catch\CatchAdmin;
+use Catch\Providers\CatchModuleServiceProvider;
+use Modules\ContentManage\Middlewares\ContentManageGate;
+
+class JiesuanServiceProvider extends CatchModuleServiceProvider
+{
+    /**
+     * middlewares
+     *
+     * @return string[]
+     */
+    protected function middlewares(): array
+    {
+       return [];
+    }
+
+    /**
+     * route path
+     *
+     * @return string|array
+     */
+    public function moduleName(): string|array
+    {
+        // TODO: Implement path() method.
+        return 'jiesuan';
+    }
+}

modules/Jiesuan/README.md

@@ -0,0 +1,10 @@
+#内容中台管理模块
+关于内容中台 相关的后台接口，对外api接口，都写在这里
+配置文件放在： config目录下，读取配置文件示例：config('contentManage.zhushuyunpublicapi.public_domain');
+config("模块名.配置文件名.配置项");
+
+数据库模型文件放在：Models 目录下面
+服务层文件放在：Services 目录下面
+控制器放在：modules/ContentManage/Http/Controllers 目录下面
+中间件放在：modules/ContentManage/Middlewares 目录下面
+路由只能现在 modules/ContentManage/rout/route.php 文件里

modules/Jiesuan/Services/BusinessmanService.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Modules\Jiesuan\Services;
+
+use Illuminate\Support\Facades\DB;
+
+class BusinessmanService
+{
+    public static function list() {
+        return DB::table('users')
+            ->join('user_has_roles', 'urser.id', 'user_has_roles.user_id')
+            ->join('roles', 'user_has_roles.role_id', 'roles.id')
+            ->where([
+                'roles.identify' => 'business',
+                'users.status' => 1,
+            ])->select('users.id', 'users.username', 'users.email')
+            ->get();
+    }
+}

modules/Jiesuan/Services/ConstService.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Modules\Jiesuan\Services;
+
+class ConstService
+{
+    /**
+     * 银行卡审核状态
+     */
+    public const BANK_CARD_CHECK_STATUS = [
+        '0' => '删除',
+        '1' => '待审核',
+        '2' => '审核通过',
+        '3' => '审核失败'
+    ];
+
+    /**
+     * 提现审核状态
+     */
+    public const TIXIAN_CHECK_STATUS = [
+        '1' => '待审核',
+        '2' => '审核失败',
+        '3' => '待打款',
+        '4' => '已打款',
+        '5' => '打款失败'
+    ];
+}

modules/Jiesuan/routes/route.php

@@ -0,0 +1,13 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+use Modules\System\Http\Controllers\NoticesController;
+use Modules\System\Http\Controllers\NoticeTypesController;
+use Modules\Video\Http\Controllers\BankAccountController;
+use Modules\Video\Http\Controllers\VideoCategoryController;
+use Modules\Video\Http\Controllers\VideoController;
+
+Route::prefix('jiesuanManage')->group(function () {
+
+});
+

modules/Tuiguang/Http/Controllers/PromotionController.php

@@ -63,7 +63,7 @@ class PromotionController extends CatchController
             $item->track_url = config('tuiguang.tuiguang.trackUrl') .
                 '/track?dycallback=1&connection_id='.$item->id.
                 '&link_source=' .( $linkSourceMap[$item->callback_type] ?? '') .
-                '&adid=__AID__&cid=__CID__&imei=__IMEI__&oaid=__OAID__&mac=__MAC__&os=__OS__&ip=__IP__&androidid=__ANDROIDID__&ua=__UA__&timestamp=__TS__&callback_url=__CALLBACK_URL__&projectid=__PROJECT_ID__&promotionid=__PROMOTION_ID__&advertiser_id=__ADVERTISER_ID__';
+                '&adid=__AID__&cid=__CID__&imei=__IMEI__&oaid=__OAID__&mac=__MAC__&os=__OS__&ip=__IP__&androidid=__ANDROIDID__&ua=__UA__&timestamp=__TS__&callback_url=__CALLBACK_URL__&projectid=__PROJECT_ID__&promotionid=__PROMOTION_ID__&advertiser_id=__ADVERTISER_ID__&campaign_id=__CAMPAIGN_ID__';
         }
 
         return $result;

tests/Video/Http/Controllers/EpisodeControllerTest.php

@@ -2,7 +2,7 @@
 
 namespace Tests\Video\Http\Controllers;
 
-use Modules\Video\Http\Controllers\EpisodeController;
+use Modules\Video\Http\Controllers\BankAccountController;
 use PHPUnit\Framework\TestCase;
 use Tests\UsedTestCase;