diff --git a/app/Admin/Controllers/Unionpay/IndexController.php b/app/Admin/Controllers/Unionpay/IndexController.php index e6b7fa8..106554f 100644 --- a/app/Admin/Controllers/Unionpay/IndexController.php +++ b/app/Admin/Controllers/Unionpay/IndexController.php @@ -7,6 +7,8 @@ use App\Admin\Actions\User\Profit; use App\Admin\Actions\User\ReCode; use App\Admin\Actions\User\RefD3Key; use App\Admin\Exporters\UsersExport; +use App\Admin\Renderable\Unionpay\InData; +use App\Admin\Renderable\Unionpay\OutData; use App\Models\Area; use App\Models\UnionpayLog; use App\Models\User; @@ -52,42 +54,30 @@ class IndexController extends AdminController ->using(config('unionpay.type')) ->label(); - $grid->column('msg_crrltn_id', '消息关联号'); + // $grid->column('msg_crrltn_id', '消息关联号'); $grid->column('msg_time', '报文日期'); $grid->column('mkt_code', '券码'); $grid->column('msg_sys_sn', '平台流水号'); - $grid->column('req_serial_no', '查询流水号'); + $grid->column('req_serial_no', '流水号'); + $grid->column('orig_req_serial_no', '原流水号'); $grid->column('status', '状态') ->using(UnionpayLog::STATUS) - ->label(); + ->label([ + 0 => 'success', + 1 => 'warning', + ]); - // $grid->column('请求参数')->display(function ($title, $column) { - // return '点击展开'; - // })->modal(function ($model) { - // $in_source = $this->in_source; - // if (is_array($in_source) && count($in_source) > 1) { - // foreach ($in_source as $key => $item) { - // dump($this->id); - // $title[] = $key; - // $data[] = $item; - // } - // - // return new Table($title, $data); - // } - // }); + $grid->column('in_source', '请求参数') + ->display(function ($title, $column) { + return '点击展开'; + })->modal(InData::class); - $grid->column('请求参数')->display(function () { - $in_source = $this->in_source; - - return $in_source; - })->hide(); - - $grid->column('返回信息')->display(function () { - $out_source = $this->out_source; - - return $out_source; - })->hide(); + $grid->column('out_source', '返回参数') + ->display(function ($title, $column) { + return '点击展开'; + })->modal(OutData::class); + // $grid->column('sett_date', '清算日期'); $grid->column('created_at', '注册时间'); $grid->disableExport(false); diff --git a/app/Admin/Renderable/Unionpay/InData.php b/app/Admin/Renderable/Unionpay/InData.php new file mode 100644 index 0000000..4e6882b --- /dev/null +++ b/app/Admin/Renderable/Unionpay/InData.php @@ -0,0 +1,26 @@ +in_source; + + if (is_array($in_source) && count($in_source) > 1) { + $table = new Table(['名称', '值'], $in_source, ['panel', ' panel-default']); + + return $table->render(); + } + } + +} \ No newline at end of file diff --git a/app/Admin/Renderable/Unionpay/OutData.php b/app/Admin/Renderable/Unionpay/OutData.php new file mode 100644 index 0000000..c79c3d8 --- /dev/null +++ b/app/Admin/Renderable/Unionpay/OutData.php @@ -0,0 +1,25 @@ +out_source; + + if (is_array($out_source) && count($out_source) > 1) { + unset($out_source['sign']); + $table = new Table(['名称', '值'], $out_source, ['panel ', 'panel-success']); + + return $table->render(); + } + } + +} \ No newline at end of file diff --git a/config/unionpay.php b/config/unionpay.php index 183e07b..9b60a02 100644 --- a/config/unionpay.php +++ b/config/unionpay.php @@ -103,7 +103,7 @@ return [ "msg_type", "msg_txn_code", "msg_crrltn_id", - "msg_flg", + // "msg_flg", "msg_sender", "msg_time", "msg_ver", @@ -115,7 +115,7 @@ return [ "msg_type", "msg_txn_code", "msg_crrltn_id", - "msg_flg", + // "msg_flg", "msg_sender", "msg_time", "msg_sys_sn", @@ -128,7 +128,7 @@ return [ "msg_type", "msg_txn_code", "msg_crrltn_id", - "msg_flg", + // "msg_flg", "msg_sender", "msg_time", "msg_sys_sn", @@ -140,7 +140,7 @@ return [ "msg_type", "msg_txn_code", "msg_crrltn_id", - "msg_flg", + // "msg_flg", "msg_sender", "msg_time", "msg_sys_sn", diff --git a/packages/coupon/README.md b/packages/coupon/README.md new file mode 100644 index 0000000..b7c61de --- /dev/null +++ b/packages/coupon/README.md @@ -0,0 +1,8 @@ +# coupon 优惠券接口 +## 接口地址:http://pac.ysd-bs.com/api/V1 + + +### 发券地址:http://pac.ysd-bs.com/api/V1/user/grant +### 查询接口:http://pa.ysd-bs.com/api/V1/user/query +### 核销地址:http://pa.ysd-bs.com/api/V1/user/freezecoupon +### 作废地址:http://pa.ysd-bs.com/api/V1/user/destroy \ No newline at end of file diff --git a/packages/unionpay/README.md b/packages/unionpay/README.md new file mode 100644 index 0000000..7b0c93f --- /dev/null +++ b/packages/unionpay/README.md @@ -0,0 +1,11 @@ +# Unionpay 对接银联接口 + +002025 聚合营销优惠查询接口 + +002100 销账交易接口 + +002101 销账冲正通知接口 + +002102 销账撤销通知接口 + +接口地址:http://pac.ysd-bs.com/api/V1/unionpay/query \ No newline at end of file