From 5d6712abc9116ead720567ebbd950c66f7988be8 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 31 May 2024 15:23:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9=EF=BC=9A?=
=?UTF-8?q?=E8=B4=A2=E5=8A=A1=E6=98=8E=E7=BB=86=E5=88=97=E8=A1=A8=20-=20?=
=?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B=E7=9A=84=E6=96=87=E5=AD=97?=
=?UTF-8?q?=E8=BF=9B=E8=A1=8C=E9=83=A8=E5=88=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controllers/IncomeRecordsController.php | 34 ++++++++++++++++++-
.../views/income/income_records.blade.php | 20 +++++------
2 files changed, 43 insertions(+), 11 deletions(-)
diff --git a/app/backend/modules/income/controllers/IncomeRecordsController.php b/app/backend/modules/income/controllers/IncomeRecordsController.php
index 96302595..9410bad3 100644
--- a/app/backend/modules/income/controllers/IncomeRecordsController.php
+++ b/app/backend/modules/income/controllers/IncomeRecordsController.php
@@ -15,6 +15,7 @@ use app\common\components\BaseController;
use app\common\facades\Setting;
use app\common\helpers\PaginationHelper;
use app\common\services\ExportService;
+use Yunshop\TeamDividend\admin\models\TeamDividendModel;
class IncomeRecordsController extends BaseController
{
@@ -23,7 +24,8 @@ class IncomeRecordsController extends BaseController
public function index()
{
if (request()->ajax()) {
- $records = Income::records()->withMember()
+ $records = Income::records()
+ ->withMember()
->with([
'hasManyOrder' => function ($query) {
$query->select('order_sn','price');
@@ -49,7 +51,37 @@ class IncomeRecordsController extends BaseController
'avatar' => tomedia($shopSet['headimg']),
];
}
+
+
+ if($item['dividend_code'] == 2){
+ $type = TeamDividendModel::where('id', $item['incometable_id'])->value('type');
+ switch ($type) {
+ case 0:
+ $item['type_name'] = '分红佣金';
+ break;
+ case 1:
+ $item['type_name'] = '示范点奖励';
+ break;
+ case 2:
+ $item['type_name'] = '感恩奖励';
+ break;
+ case 3:
+ $item['type_name'] = '额外分红';
+ break;
+ case 7:
+ $item['type_name'] = '推广佣金';// 月月返
+ break;
+ case 8:
+ $item['type_name'] = '拓新奖';// 分红奖
+ break;
+ }
+ }
+ else if($item['dividend_code'] == 203){
+ $item['type_name'] = '合作养殖补助';
+ }
}
+
+
return $this->successJson('ok', [
'pageList' => $pageList,
'search' => $search,
diff --git a/resources/views/income/income_records.blade.php b/resources/views/income/income_records.blade.php
index 8b6dc733..381e65bc 100644
--- a/resources/views/income/income_records.blade.php
+++ b/resources/views/income/income_records.blade.php
@@ -38,16 +38,16 @@
clearable>
-
-
-
-
-
-
+ {{----}}
+ {{-- --}}
+ {{-- --}}
+ {{-- --}}
+ {{-- --}}
+ {{----}}