From 8dd5c1c00c5d96f4dc6a8aa7f706c96d2e29fcd3 Mon Sep 17 00:00:00 2001 From: luofei <604446095@qq.com> Date: Mon, 4 Mar 2024 11:34:52 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/system/merchant/FinancialRecord.php | 21 +++++++++ crmeb/services/ExcelService.php | 47 ++++++++++++------- 2 files changed, 51 insertions(+), 17 deletions(-) diff --git a/app/common/model/system/merchant/FinancialRecord.php b/app/common/model/system/merchant/FinancialRecord.php index 1533aa05..3a62f102 100755 --- a/app/common/model/system/merchant/FinancialRecord.php +++ b/app/common/model/system/merchant/FinancialRecord.php @@ -50,4 +50,25 @@ class FinancialRecord extends BaseModel { return $this->hasOne(StoreRefundOrder::class,'refund_order_sn','order_sn'); } + + /** + * 获取备注 + * @return string + */ + public function getMark() + { + switch ($this->financial_type) { + case 'commission_to_platform': + return '平台手续费：' . $this->number; + case 'platform_consumption': + return '平台优惠：' . $this->number; + case 'auto_margin': + return '保证金：' . $this->number; + case 'commission_to_promoter': + return '推广佣金：' . $this->number; + default: + return ''; + } + } + } diff --git a/crmeb/services/ExcelService.php b/crmeb/services/ExcelService.php index 7d3ae3f5..4e53ef3c 100755 --- a/crmeb/services/ExcelService.php +++ b/crmeb/services/ExcelService.php @@ -12,6 +12,7 @@ namespace crmeb\services; +use app\common\model\system\merchant\FinancialRecord; use app\common\repositories\store\order\StoreImportDeliveryRepository; use app\common\repositories\store\order\StoreOrderProfitsharingRepository; use app\common\repositories\store\order\StoreOrderRepository; @@ -355,34 +356,46 @@ class ExcelService $limit = 20; $count = $query->count(); $i = 1; + /** @var StoreOrderRepository $order_make */ $order_make = app()->make(StoreOrderRepository::class); //平台 if (!$where['is_mer']) { $header = ['商户类别', '商户分类', '商户名称', '总订单号', '订单编号', '交易流水号', '交易时间', '对方信息', '交易类型', '收支金额', '备注']; - $list = $query->page($page, $limit)->order('create_time DESC')->select(); - foreach ($list as $k => $value) { - $order = $order_make->get($value['order_id']); - if ($value['merchant']) { - $export[$k] = [ - $value['merchant']['is_trader'] ? '自营' : '非自营', - $value['merchant']['merchantCategory']['category_name'] ?? '平台', - $value['merchant']['mer_name'] ?? '平台', + $list = $query->where('financial_type', 'order')->page($page, $limit)->order('create_time DESC')->select(); + foreach ($list as $financialRecord) { + $otherRecords = FinancialRecord::where('order_id', $financialRecord['order_id']) + ->where('financial_type', '<>', 'order') + ->field('financial_type,number') + ->select(); + $mark = []; + foreach ($otherRecords as $otherRecord) { + /** @var FinancialRecord $otherRecord */ + if (!empty($otherRecord->getMark())) { + $mark[] = $otherRecord->getMark(); + } + } + if ($financialRecord['merchant']) { + $exportItem = [ + $financialRecord['merchant']['is_trader'] ? '自营' : '非自营', + $financialRecord['merchant']['merchantCategory']['category_name'] ?? '平台', + $financialRecord['merchant']['mer_name'] ?? '平台', ]; }else{ - $export[$k] = [ + $exportItem = [ '平台', '平台', '平台', ]; } - $export[$k][] = ['groupOrder']['group_order_sn'] ?? '无数据'; - $export[$k][] = $value['order_sn']; - $export[$k][] = $value['financial_record_sn']; - $export[$k][] = $value['create_time']; - $export[$k][] = $value['user_info']; - $export[$k][] = $financialType[$value['financial_type']]; - $export[$k][] = (in_array($value['financial_type'], $sys_pm_1) ? '+' : '-') . $value['number']; - $export[$k][] = ''; + $exportItem[] = ['groupOrder']['group_order_sn'] ?? '无数据'; + $exportItem[] = $financialRecord['order_sn']; + $exportItem[] = $financialRecord['financial_record_sn']; + $exportItem[] = $financialRecord['create_time']; + $exportItem[] = $financialRecord['user_info']; + $exportItem[] = $financialType[$financialRecord['financial_type']]; + $exportItem[] = (in_array($financialRecord['financial_type'], $sys_pm_1) ? '+' : '-') . $financialRecord['number']; + $exportItem[] = implode(',', $mark); + $export[] = $exportItem; } $foot = [ '合计：平台应入账手续费 ' . $charge, From 3d08875baac76258a80ae9cef7fac405d0f7ef79 Mon Sep 17 00:00:00 2001 From: luofei <604446095@qq.com> Date: Mon, 4 Mar 2024 13:42:36 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=B5=81=E6=B0=B4=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/system/merchant/FinancialRecord.php | 7 +- .../store/order/StoreOrderRepository.php | 2 +- .../admin/system/merchant/FinancialRecord.php | 24 +++ crmeb/services/ExcelService.php | 137 ++++++++++++++---- route/admin/accounts.php | 3 + 5 files changed, 139 insertions(+), 34 deletions(-) diff --git a/app/common/model/system/merchant/FinancialRecord.php b/app/common/model/system/merchant/FinancialRecord.php index 3a62f102..c3d7ecf8 100755 --- a/app/common/model/system/merchant/FinancialRecord.php +++ b/app/common/model/system/merchant/FinancialRecord.php @@ -61,13 +61,14 @@ class FinancialRecord extends BaseModel case 'commission_to_platform': return '平台手续费：' . $this->number; case 'platform_consumption': - return '平台优惠：' . $this->number; + return '使用平台优惠：' . $this->number; case 'auto_margin': return '保证金：' . $this->number; case 'commission_to_promoter': - return '推广佣金：' . $this->number; + $nickname = User::where('uid', $this->user_id)->value('nickname'); + return "“{$nickname}”获得推广佣金：" . $this->number; default: - return ''; + return '商户入账：' . $this->number; } } diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php index b0985eca..86cb7bc1 100755 --- a/app/common/repositories/store/order/StoreOrderRepository.php +++ b/app/common/repositories/store/order/StoreOrderRepository.php @@ -327,7 +327,7 @@ class StoreOrderRepository extends BaseRepository $platformCommission = bcmul($orderValidAmount, (string)$commission_rate, 2); if ($commission_rate > 0 && $platformCommission > 0) { $orderValidAmount = bcsub($orderValidAmount, $platformCommission, 2); - if ($promoterCommission > 0) { + if ($promoterCommission > 0 && !empty($promoter)) { $platformCommission = bcsub($platformCommission, $promoterCommission, 2); } $financeDao->platformIn($platformCommission, 'commission_to_platform', $order['mer_id']); diff --git a/app/controller/admin/system/merchant/FinancialRecord.php b/app/controller/admin/system/merchant/FinancialRecord.php index c860bc65..e40ce2b7 100755 --- a/app/controller/admin/system/merchant/FinancialRecord.php +++ b/app/controller/admin/system/merchant/FinancialRecord.php @@ -161,4 +161,28 @@ class FinancialRecord extends BaseController return app('json')->success($data); } + /** + * TODO 导出文件 + * @param $type + * @author Qinii + * @day 3/25/21 + */ + public function exportDetail2($type) + { + [$page, $limit] = $this->getPage(); + $date = $this->request->param('date'); + $where['date'] = empty($date) ? date('Y-m-d',time()) : $date ; + $where['type'] = $type; + $where['is_mer'] = $this->request->merId() ?? 0 ; + try { + $merchant = $this->request->merchant(); + }catch (\Exception $e){ + $merchant = []; + } + /** @var ExcelService $make */ + $make = app()->make(ExcelService::class); + $data = $make->exportFinancial2($where,$page,$limit,$merchant); + return app('json')->success($data); + } + } diff --git a/crmeb/services/ExcelService.php b/crmeb/services/ExcelService.php index 4e53ef3c..ce520590 100755 --- a/crmeb/services/ExcelService.php +++ b/crmeb/services/ExcelService.php @@ -314,7 +314,7 @@ class ExcelService } /** - * TODO 平台/商户 导出日月账单信息 + * 平台/商户 导出日月账单信息 * @param array $where * @param int $id * @author Qinii @@ -356,46 +356,34 @@ class ExcelService $limit = 20; $count = $query->count(); $i = 1; - /** @var StoreOrderRepository $order_make */ $order_make = app()->make(StoreOrderRepository::class); //平台 if (!$where['is_mer']) { $header = ['商户类别', '商户分类', '商户名称', '总订单号', '订单编号', '交易流水号', '交易时间', '对方信息', '交易类型', '收支金额', '备注']; - $list = $query->where('financial_type', 'order')->page($page, $limit)->order('create_time DESC')->select(); - foreach ($list as $financialRecord) { - $otherRecords = FinancialRecord::where('order_id', $financialRecord['order_id']) - ->where('financial_type', '<>', 'order') - ->field('financial_type,number') - ->select(); - $mark = []; - foreach ($otherRecords as $otherRecord) { - /** @var FinancialRecord $otherRecord */ - if (!empty($otherRecord->getMark())) { - $mark[] = $otherRecord->getMark(); - } - } - if ($financialRecord['merchant']) { - $exportItem = [ - $financialRecord['merchant']['is_trader'] ? '自营' : '非自营', - $financialRecord['merchant']['merchantCategory']['category_name'] ?? '平台', - $financialRecord['merchant']['mer_name'] ?? '平台', + $list = $query->page($page, $limit)->order('create_time DESC')->select(); + foreach ($list as $k => $value) { + $order = $order_make->get($value['order_id']); + if ($value['merchant']) { + $export[$k] = [ + $value['merchant']['is_trader'] ? '自营' : '非自营', + $value['merchant']['merchantCategory']['category_name'] ?? '平台', + $value['merchant']['mer_name'] ?? '平台', ]; }else{ - $exportItem = [ + $export[$k] = [ '平台', '平台', '平台', ]; } - $exportItem[] = ['groupOrder']['group_order_sn'] ?? '无数据'; - $exportItem[] = $financialRecord['order_sn']; - $exportItem[] = $financialRecord['financial_record_sn']; - $exportItem[] = $financialRecord['create_time']; - $exportItem[] = $financialRecord['user_info']; - $exportItem[] = $financialType[$financialRecord['financial_type']]; - $exportItem[] = (in_array($financialRecord['financial_type'], $sys_pm_1) ? '+' : '-') . $financialRecord['number']; - $exportItem[] = implode(',', $mark); - $export[] = $exportItem; + $export[$k][] = ['groupOrder']['group_order_sn'] ?? '无数据'; + $export[$k][] = $value['order_sn']; + $export[$k][] = $value['financial_record_sn']; + $export[$k][] = $value['create_time']; + $export[$k][] = $value['user_info']; + $export[$k][] = $financialType[$value['financial_type']]; + $export[$k][] = (in_array($value['financial_type'], $sys_pm_1) ? '+' : '-') . $value['number']; + $export[$k][] = ''; } $foot = [ '合计：平台应入账手续费 ' . $charge, @@ -452,6 +440,95 @@ class ExcelService return compact('count', 'header', 'title', 'export', 'foot', 'filename'); } + /** + * 平台导出日月账单信息 + * @param array $where + * @param int $page + * @param int $limit + * @param $merchant + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + */ + public function exportFinancial2(array $where, int $page, int $limit, $merchant = []) + { + $financialType = FinancialRecordRepository::TYPE_CN_MAP; + $date_ = $where['date']; + unset($where['date']); + /** @var FinancialRecordRepository $make */ + $make = app()->make(FinancialRecordRepository::class); + $query = $make->search($where)->with(['orderInfo', 'refundOrder', 'merchant.merchantCategory']); + if ($where['type'] == 1) { + $title_ = '日账单'; + $start_date = $date_ . ' 00:00:00'; + $end_date = $date_ . ' 23:59:59'; + $query->whereDay('create_time', $date_); + } else { + $title_ = '月账单'; + $start_date = (date('Y-m-01', strtotime($date_))); + $end_date = date('Y-m-d', strtotime("$start_date +1 month -1 day")); + $query->whereMonth('create_time', $date_); + } + $query->where('financial_type', 'order'); + $income = $make->countIncome($where['type'], $where, $date_, $merchant); + $expend = $make->countExpend($where['type'], $where, $date_, $merchant); + $charge = bcsub($income['number'], $expend['number'], 2); + $filename = $title_ . '(' . $date_ . ')' . time(); + $export = []; + $limit = 20; + $count = $query->count(); + $header = ['商户类别', '商户分类', '商户名称', '总订单号', '订单编号', '交易流水号', '交易时间', '对方信息', '交易类型', '收支金额', '备注']; + $list = $query->page($page, $limit)->order('create_time DESC')->select(); + foreach ($list as $financialRecord) { + $otherRecords = FinancialRecord::where('order_id', $financialRecord['order_id']) + ->whereIn('financial_type', ['commission_to_platform', 'platform_consumption', 'auto_margin', 'commission_to_promoter', 'merchant_order']) + ->field('financial_type,number') + ->select(); + $mark = []; + foreach ($otherRecords as $otherRecord) { + /** @var FinancialRecord $otherRecord */ + if (!empty($otherRecord->getMark())) { + $mark[] = $otherRecord->getMark(); + } + } + if ($financialRecord['merchant']) { + $exportItem = [ + $financialRecord['merchant']['is_trader'] ? '自营' : '非自营', + $financialRecord['merchant']['merchantCategory']['category_name'] ?? '平台', + $financialRecord['merchant']['mer_name'] ?? '平台', + ]; + }else{ + $exportItem = [ + '平台', + '平台', + '平台', + ]; + } + $exportItem[] = ['groupOrder']['group_order_sn'] ?? '无数据'; + $exportItem[] = $financialRecord['order_sn']; + $exportItem[] = $financialRecord['financial_record_sn']; + $exportItem[] = $financialRecord['create_time']; + $exportItem[] = $financialRecord['user_info']; + $exportItem[] = $financialType[$financialRecord['financial_type']]; + $exportItem[] = $financialRecord['number']; + $exportItem[] = implode(',', $mark); + $export[] = $exportItem; + } + $foot = [ + '合计：平台应入账手续费 ' . $charge, + '收入合计： ' . '订单支付' . $income['count'] . '笔,' . '实际支付金额共:' . $income['number'] . '元;', + '支出合计： ' . '佣金支出' . $expend['count_brokerage'] . '笔,支出金额：' . $expend['number_brokerage'] . '元；商户入账支出' . $expend['count_order'] . '笔，支出金额：' . $expend['number_order'] . '元；退款手续费' . $expend['count_charge'] . '笔，支出金额' . $expend['number_charge'] . '元；合计支出' . $expend['number'], + ]; + $title = [ + $title_, + $mer_name ?? '平台', + '结算账期：【' . $start_date . '】至【' . $end_date . '】', + '生成时间:' . date('Y-m-d H:i:s', time()) + ]; + return compact('count', 'header', 'title', 'export', 'foot', 'filename'); + } + /** * TODO 退款单导出 * @param array $where diff --git a/route/admin/accounts.php b/route/admin/accounts.php index 6da6e1bb..15b82f4f 100755 --- a/route/admin/accounts.php +++ b/route/admin/accounts.php @@ -196,6 +196,9 @@ Route::group(function () { Route::get('detail_export/:type', '/exportDetail')->name('systemFinancialRecordDetailExport')->option([ '_alias' => '导出', ]); + Route::get('detail_export2/:type', '/exportDetail2')->name('systemFinancialRecordDetailExport2')->option([ + '_alias' => '导出', + ]); })->prefix('admin.system.merchant.FinancialRecord')->option([ '_path' => '/accounts/statement', '_auth' => true, From 65a156fbffb1d132e348d1c66b7d4ae4e7306b4d Mon Sep 17 00:00:00 2001 From: luofei <604446095@qq.com> Date: Mon, 4 Mar 2024 14:31:35 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E6=88=B7?= =?UTF-8?q?=E5=85=A5=E9=A9=BB=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/merchant/MerchantIntentionRepository.php | 1 + app/controller/api/store/merchant/MerchantIntention.php | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/app/common/repositories/system/merchant/MerchantIntentionRepository.php b/app/common/repositories/system/merchant/MerchantIntentionRepository.php index 56c48c81..8a9c197d 100755 --- a/app/common/repositories/system/merchant/MerchantIntentionRepository.php +++ b/app/common/repositories/system/merchant/MerchantIntentionRepository.php @@ -151,6 +151,7 @@ class MerchantIntentionRepository extends BaseRepository 'business_status'=>2, 'mer_settlement_agree_status'=>1, 'commission_rate'=>$commissionRate, + 'financial_bank'=>$intention['financial_bank'], ]; if($margin['type_code']=='PersonalStore'){ $merData['mer_address']='集体地址'; diff --git a/app/controller/api/store/merchant/MerchantIntention.php b/app/controller/api/store/merchant/MerchantIntention.php index 32339ffa..0bd7970b 100755 --- a/app/controller/api/store/merchant/MerchantIntention.php +++ b/app/controller/api/store/merchant/MerchantIntention.php @@ -344,8 +344,12 @@ class MerchantIntention extends BaseController 'bank_back', 'cardno_front', 'cardno_back', + 'financial_bank', ]); + if (!empty($data['financial_bank'])) { + $data['financial_bank'] = json_encode($data['financial_bank']); + } app()->make(MerchantIntentionValidate::class)->check($data); $check = app()->make(SmsService::class)->checkSmsCode($data['phone'], $data['code'], 'intention'); $data['mer_type_id'] = (int)$data['mer_type_id']; From 2c9d3754690dbbb6e790000b802cad52c632241d Mon Sep 17 00:00:00 2001 From: luofei <604446095@qq.com> Date: Mon, 4 Mar 2024 15:25:59 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E6=88=B7?= =?UTF-8?q?=E5=85=A5=E9=A9=BB=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/api/store/merchant/MerchantIntention.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controller/api/store/merchant/MerchantIntention.php b/app/controller/api/store/merchant/MerchantIntention.php index 0bd7970b..83d9d0a5 100755 --- a/app/controller/api/store/merchant/MerchantIntention.php +++ b/app/controller/api/store/merchant/MerchantIntention.php @@ -101,8 +101,12 @@ class MerchantIntention extends BaseController 'street_id', 'village_id', 'is_nmsc', - 'is_company' + 'is_company', + 'financial_bank' ]); + if (!empty($data['financial_bank'])) { + $data['financial_bank'] = json_encode($data['financial_bank']); + } if (!systemConfig('mer_intention_open')) { return app('json')->fail('未开启商户入驻'); } From 8b6f0d7c0411812a8fdf3cf12c892c2e6d690d4d Mon Sep 17 00:00:00 2001 From: luofei <604446095@qq.com> Date: Mon, 4 Mar 2024 15:52:46 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E6=88=B7?= =?UTF-8?q?=E6=89=8B=E7=BB=AD=E8=B4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/merchant/MerchantIntentionRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/common/repositories/system/merchant/MerchantIntentionRepository.php b/app/common/repositories/system/merchant/MerchantIntentionRepository.php index 8a9c197d..0ee93605 100755 --- a/app/common/repositories/system/merchant/MerchantIntentionRepository.php +++ b/app/common/repositories/system/merchant/MerchantIntentionRepository.php @@ -150,7 +150,7 @@ class MerchantIntentionRepository extends BaseRepository 'is_company'=>$intention['is_company'], 'business_status'=>2, 'mer_settlement_agree_status'=>1, - 'commission_rate'=>$commissionRate, + 'commission_rate'=>$commissionRate * 100, 'financial_bank'=>$intention['financial_bank'], ]; if($margin['type_code']=='PersonalStore'){ From 6999d00e071e88e18fcd9f648a0fe30381fb4cf5 Mon Sep 17 00:00:00 2001 From: luofei <604446095@qq.com> Date: Mon, 4 Mar 2024 17:28:48 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=A4=84=E7=90=86=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8F=91=E8=B4=A7=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/order/StoreOrderRepository.php | 3 +++ .../store/order/StoreOrderStatusRepository.php | 14 +++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php index 86cb7bc1..e7242390 100755 --- a/app/common/repositories/store/order/StoreOrderRepository.php +++ b/app/common/repositories/store/order/StoreOrderRepository.php @@ -1344,6 +1344,7 @@ class StoreOrderRepository extends BaseRepository if ($order['is_virtual'] && $data['delivery_type'] != 3) throw new ValidateException('虚拟商品只能虚拟发货'); //订单记录 + /** @var StoreOrderStatusRepository $statusRepository */ $statusRepository = app()->make(StoreOrderStatusRepository::class); switch ($data['delivery_type']) { case 1: @@ -1385,6 +1386,8 @@ class StoreOrderRepository extends BaseRepository 'change_message' => $change_message, 'change_type' => $change_type, ]; + $statusRepository->adminId = $order['mer_id']; + $statusRepository->adminNickname = $order->merchant['nickname']; if ($service_id) { $statusRepository->createServiceLog($service_id, $orderStatus); } else { diff --git a/app/common/repositories/store/order/StoreOrderStatusRepository.php b/app/common/repositories/store/order/StoreOrderStatusRepository.php index d0c1ffc8..d5378174 100755 --- a/app/common/repositories/store/order/StoreOrderStatusRepository.php +++ b/app/common/repositories/store/order/StoreOrderStatusRepository.php @@ -100,6 +100,8 @@ class StoreOrderStatusRepository extends BaseRepository const ORDER_DELIVERY_CITY_REFUND = 'delivery_5_10'; const ORDER_DELIVERY_CITY_REFUNDING = 'delivery_5_9'; + public $adminId; + public $adminNickname; /** * StoreOrderStatusRepository constructor. @@ -134,9 +136,15 @@ class StoreOrderStatusRepository extends BaseRepository public function createAdminLog(array $data) { $request = request(); - $data['user_type'] = $request->userType(); - $data['uid'] = $data['user_type'] == 1 ? $request->uid() : $request->adminId(); - $data['nickname'] = $data['user_type'] == 1 ? $request->userInfo()->real_name : $request->adminInfo()->real_name; + if ($request->hasMacro('userType')) { + $data['user_type'] = $request->userType(); + $data['uid'] = $data['user_type'] == 1 ? $request->uid() : $request->adminId(); + $data['nickname'] = $data['user_type'] == 1 ? $request->userInfo()->real_name : $request->adminInfo()->real_name; + } else { + $data['user_type'] = 3; + $data['uid'] = $this->adminId; + $data['nickname'] = $this->adminNickname; + } return $this->dao->create($data); }