diff --git a/app/backend/modules/withdraw/controllers/DetailController.php b/app/backend/modules/withdraw/controllers/DetailController.php index aa94b5f2..1b8322b5 100644 --- a/app/backend/modules/withdraw/controllers/DetailController.php +++ b/app/backend/modules/withdraw/controllers/DetailController.php @@ -16,7 +16,7 @@ use app\common\facades\Setting; use app\common\models\Income; use app\common\services\Session; use app\common\models\WithdrawMergeServicetaxRate; - +use Yunshop\TeamDividend\admin\models\TeamDividendModel; class DetailController extends BaseController { @@ -37,8 +37,8 @@ class DetailController extends BaseController return request()->ajax() ? $this->jsonData() : view('withdraw.detail', $this->resultData()); } - private function jsonData() - { + private function jsonData(){ + return $this->successJson('ok', $this->resultData()); } @@ -110,6 +110,34 @@ class DetailController extends BaseController $incomeModel->detail = collect($detail)->values()->toJson(); } + + + + $incomeModel->type_name = '合作养殖补助'; + if($incomeModel->dividend_code == 2){ + $type = TeamDividendModel::where('id', $incomeModel->incometable_id)->value('type'); + switch ($type) { + case 0: + $incomeModel->type_name = '分红佣金'; + break; + case 1: + $incomeModel->type_name = '示范点奖励'; + break; + case 2: + $incomeModel->type_name = '感恩奖励'; + break; + case 3: + $incomeModel->type_name = '额外分红'; + break; + case 7: + $incomeModel->type_name = '推广佣金';// 月月返 + break; + case 8: + $incomeModel->type_name = '拓新奖';// 分红奖 + break; + } + } + }); return $incomeModels; } diff --git a/plugins/commission.rar b/plugins/commission.rar new file mode 100644 index 00000000..875852af Binary files /dev/null and b/plugins/commission.rar differ diff --git a/plugins/team-dividend.rar b/plugins/team-dividend.rar new file mode 100644 index 00000000..2b056615 Binary files /dev/null and b/plugins/team-dividend.rar differ