Skip to content

S
service
Commit 829e82b3 by yink
Options

feat: 在多个控制器中添加新字段和功能 

在StoreAdminEmployeeController、OrderDivideRecordController、UserController、GoodController、OrderInfoController和UserPointChangeRecController中添加了新字段和功能，包括创建时间、分佣比例、用户ID筛选、分佣比例详情展示、用户手机号链接、订单状态标签等。这些改动旨在提升系统的功能性和用户体验。
parent 0f1a9aa9
Showing with 55 additions and 16 deletions
app/Admin/Controllers/GoodController.php
......@@ -60,7 +60,19 @@ protected function grid()
})->else(function ($column) {
return '';
});
$grid->column('commission', '分佣比例')->display('点击查看')->modal(function ($modal) {
$modal->title('分佣比例详情');
$content = "<strong>直推返积分比例：</strong> {$this->first_commission}%<br/>";
$content .= "<strong>间推返积分比例：</strong> {$this->second_commission}%<br/>";
$content .= "<strong>商家佣金比例：</strong> {$this->merchant_commission}%";
$card = new Card(null, $content);
return "<div style='padding:10px 10px 0;width:100%;'>$card</div>";
});
$grid->column('sort', '排序');
$grid->column('is_hot', '是否推荐')->display(function ($val) {
return ($val == 1) ? '是' : '否';
});
......
app/Admin/Controllers/OrderDivideRecordController.php
......@@ -28,6 +28,7 @@ protected function grid()
$grid->column('users.phone', '下单会员手机号');
//$grid->column('og_id', '订单商品ID');
$grid->column('order_price', '订单商品价格');
$grid->column('proportion', '分佣比例');
$grid->column('divide_price', '佣金');
//$grid->column('proportion', '分佣比例%');
$grid->column('sh_type', '分佣类型')->display(function ($val) {
......
app/Admin/Controllers/OrderInfoController.php
......@@ -34,7 +34,12 @@ protected function grid()
$grid->model()->orderBy('id', 'DESC');
$grid->column('id')->sortable();
$grid->column('order_sn', '订单号')->width(80);
$grid->column('mobile', '手机号');
// 添加用户昵手机号
$grid->column('mobile', '手机号')->display(function ($name) {
return "<a href='/user?id={$this->user_id}' >{$this->mobile}</a>";
});
$grid->column('is_div', '是否分账')->display(function ($val) {
return $val ? '是' : '否';
});
......@@ -105,12 +110,18 @@ protected function grid()
$card = new Card(null, $content);
return "<div style='padding:10px 10px 0;width:100%;'>$card</div>";
});
$grid->column('order_status', '状态')->display(function ($val) {
$options = OrderInfo::STATUS_OPTIONS;
return $options[$val];
})->if(function ($column) {
})->label([
0 => 'primary', // 待付款 - 蓝色
1 => 'warning', // 待发货 - 橙色
2 => 'info', // 待到货 - 青色
3 => 'warning', // 待评价 - 橙色
4 => 'success', // 已完成 - 绿色
7 => 'danger', // 已取消 - 红色
8 => 'dark' // 已退款 - 灰色
])->if(function ($column) {
return $column->getValue() == 1;
})->display('点击生成核销码')->modal(function (Grid\Displayers\Modal $modal) {
// 标题
......
app/Admin/Controllers/StoreAdminEmployeeController.php
......@@ -33,6 +33,7 @@ protected function grid()
$grid->column('store.title', '所属门店');
$grid->column('employee_commission', '员工返佣比例');
$grid->column('member_id', '汇付用户ID');
$grid->column('created_at', '创建时间');
// $grid->column('created_at');
// $grid->column('updated_at')->sortable();
$grid->disableViewButton();
......
app/Admin/Controllers/UserController.php
......@@ -34,6 +34,9 @@ protected function grid()
$grid->model()->when(request('buycode'), function ($query) {
$query->where('buycode', request('buycode'));
});
$grid->model()->when(request('id'), function ($query) {
$query->where('id', request('id'));
});
$grid->model()->orderBy('created_at', 'DESC');
$grid->column('id')->sortable();
......@@ -107,6 +110,7 @@ protected function grid()
$grid->filter(function (Grid\Filter $filter) {
// 更改为 panel 布局
$filter->panel();
$filter->like('id')->width(3);
$filter->like('name')->width(3);
$filter->like('phone')->width(3);
$filter->like('buycode', '直购码')->width(3);
......
app/Admin/Controllers/UserPointChangeRecController.php
......@@ -23,9 +23,14 @@ protected function grid()
$grid->model()->orderBy('created_at', 'DESC');
$grid->column('id', 'ID')->sortable();
$grid->column('user_id', '用户ID');
// 添加用户id字段
$grid->column('user_id', '用户ID')->display(function ($userId) {
return "<a href='/user?id={$userId}' >{$userId}</a>";
});
// 添加用户昵称字段
$grid->column('user.name', '用户昵称');
$grid->column('user.phone', '用户手机');
$grid->column('user.name', '用户昵称')->display(function ($name) {
return "<a href='/user?id={$this->user_id}' >{$name}</a>";
});
$grid->column('order_id', '关联订单号');
$grid->column('point_amount', '积分数量')->display(function ($value) {
......@@ -41,18 +46,19 @@ protected function grid()
$grid->column('created_at', '创建时间')->sortable();
$grid->filter(function ($filter) {
$filter->equal('user_id', '用户ID');
$filter->panel();
$filter->equal('user_id', '用户ID')->width(3);
// 添加用户昵称筛选
$filter->like('user.nickname', '用户昵称');
$filter->like('user.nickname', '用户昵称')->width(3);
$filter->equal('change_type', '增减类别')->radio([
1 => '增加',
0 => '减少'
]);
])->width(4);
$filter->equal('point_state', '积分状态')->select([
1 => '已完成',
2 => '解冻中',
3 => '冻结中'
]);
])->width(3);
// 添加时间范围筛选
$filter->scope('today', '今日')->whereDate('created_at', date('Y-m-d'));
......@@ -83,7 +89,7 @@ protected function grid()
});
$filter->scope('year', '本年')->whereYear('created_at', date('Y'));
$filter->between('created_at', '自定义时间范围')->datetime();
$filter->between('created_at', '自定义时间范围')->datetime()->width(5);
});
// 添加导出按钮
......
app/Models/Adapay.php
......@@ -51,8 +51,12 @@ public function pay($order_title, $order_sn, $order_amount, $openid)
# 发起支付
$payment->create($payment_params);
# 对支付结果进行处理
Log::add('--调起支付--', $payment->result);
# 发起支付并记录日志
Log::add('支付参数及结果', [
'params' => $payment_params,
'result' => $payment->result
]);
if ($payment->isError()) {
//失败处理
throw new \Exception($payment->result['error_msg']);
......@@ -98,13 +102,13 @@ public function payNotify($params = [])
$orderObj->freeze_stat = $message['freeze_stat'];
if ($orderObj->save()) {
if ($orderObj->pay_type=1) {//纯现金支付才返积分
if ($orderObj->pay_type = 1) { //纯现金支付才返积分
//创建直推分积分记录
$this->createPointRecordByOrder($orderObj->id);
}
//更新商品销量、库存
$this->updateGoodsStock($orderObj);
$this->updateGoodsStock($orderObj);
// //更新商品销量、库存
// $goodsList = OrderGoods::where("order_id", $orderObj->id)->get();
......@@ -499,7 +503,7 @@ public static function handlePaymentConfirmAndDivide($order_no, $order_id)
//交易记录
$prObj = PaymentRecord::where('order_sn', $order_no)->first();
Log::add('debug', ['order_sn' => $order_no]);
if (!$prObj) {
Log::add('handlePaymentConfirmAndDivide', ['order_sn' => $order_no]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment