xuanchen/pingan_new
0
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

微淘

Browse Source
This commit is contained in:
徐永宾
2020-10-13 13:44:45 +08:00
parent 59cf8a26c4
commit 4d97481515
7 changed files with 132 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Admin/Controllers/Activity/IndexController.php
View File

@@ -2,6 +2,7 @@
namespace App\Admin\Controllers\Activity;
use App\Admin\Renderable\Activity\Grants;
use App\Models\Activity;
use App\Models\ActivityGrant;
use App\Models\ActivityRule;
@@ -86,7 +87,6 @@ class IndexController extends AdminController
$query->where('identity_id', 1);
})->get()->pluck('nickname', 'id');
$filter->equal('user_id', '渠道')->select($users);
});
$filter->column(1 / 2, function ($filter) {
@@ -100,10 +100,6 @@ class IndexController extends AdminController
$grid->column('title', '活动名称');
$grid->column('code', '活动编号');
$grid->column('rule.code', '卡券规则');
$grid->column('所属')->display(function () {
return $this->user_id ? $this->user->nickname : '系统';
});
$grid->column('类型')->display(function () {
return $this->type_text;
});
@@ -111,6 +107,20 @@ class IndexController extends AdminController
$grid->column('days', '延期(天)');
$grid->column('rule.full', '满足金额');
$grid->column('rule.take', '扣除金额');
$grid->column('发券')
->display(function () {
return $this->grants->pluck('user_nickname');
})
->label()
->hide();
$grid->column('核券')
->display(function () {
return $this->verifications->pluck('user_nickname');
})
->label()
->hide();
$grid->column('开始时间')->display(function () {
return $this->type == Activity::TYPE_SCOPE ? $this->start_at->format('Y-m-d') : '---';
});

32
app/Admin/Controllers/Activity/RuleController.php
View File

@@ -54,25 +54,27 @@ class RuleController extends AdminController
$form->switch('status', '状态')->default(1);
$form->saving(function (Form $form) {
$code = $form->code;
if ($form->code) {
$code = $form->code;
$ticket = explode('-', $code);
if (!is_array($ticket) || count($ticket) != 3) {
$error = new MessageBag([
'title' => '错误',
'message' => '规则编号格式错误',
]);
$ticket = explode('-', $code);
if (!is_array($ticket) || count($ticket) != 3) {
$error = new MessageBag([
'title' => '错误',
'message' => '规则编号格式错误',
]);
return back()->withInput()->with(compact('error'));
return back()->withInput()->with(compact('error'));
}
$full = $ticket[1]; //full100
$price = $ticket[2];
preg_match('/\d+/', $full, $match);
$form->full = $match[0];
$form->take = $price;
}
$full = $ticket[1]; //full100
$price = $ticket[2];
preg_match('/\d+/', $full, $match);
$form->full = $match[0];
$form->take = $price;
});
return $form;

1
app/Admin/Controllers/Finance/IndexController.php
View File

@@ -59,7 +59,6 @@ class IndexController extends AdminController
->whereHas('identity', function ($query) {
$query->where('identity_id', 1);
})
->where('type', 'pingan')
->get()
->pluck('nickname', 'id');

6
app/Admin/Controllers/User/IndexController.php
View File

@@ -143,15 +143,13 @@ class IndexController extends AdminController
$grid->column('分润规则')->display(function ($title, $column) {
return '点击展开';
})->modal(function ($model) {
if ($model->code) {
$codes = $model->code->map(function ($code) {
return $code->only(['name', 'code', 'profit']);
});
$table = new Table(['名称', '规则项', '分润金额(元)'], $codes->toArray());
return trim($table->render(), '"');
return new Table(['名称', '规则项', '分润金额(元)'], $codes->toArray());
}
});

52
app/Api/Controllers/UnionPayController.php
View File

@@ -24,54 +24,6 @@ class UnionPayController extends Controller
}
//签名
public function toSign($sign_data)
{
//签名字段
// $sign_data['msg_type'] = $array['msg_type'];
// $sign_data['msg_txn_code'] = $array['msg_txn_code'];
// $sign_data['msg_crrltn_id'] = $array['msg_crrltn_id'];
// $sign_data['msg_flg'] = $array['msg_flg'];
// $sign_data['msg_sender'] = $array['msg_sender'];
// $sign_data['msg_time'] = $array['msg_time'];
// $sign_data['msg_sys_sn'] = $array['msg_sys_sn'];
// $sign_data['msg_ver'] = $array['msg_ver'];
// if (isset($array['msg_rsp_code'])) {
// $sign_data['msg_rsp_code'] = $array['msg_rsp_code'];
// }
// if (isset($array['msg_rsp_desc'])) {
// $sign_data['msg_rsp_desc'] = $array['msg_rsp_desc'];
// }
//将字段名按字母表顺序排序
ksort($sign_data);
//将post的数据utf-8编码
$str_data = utf8_encode(http_build_query($sign_data));
//获取私钥资源ID
$private = config('unionpay.check.self.private');
if (!file_exists($private)) {
throw new \Exception('缺少私钥文件');
}
$private_key = file_get_contents($private);
$pkeyid = openssl_get_privatekey($private_key);
//签名赋值sign
if (openssl_sign($str_data, $sign, $pkeyid)) {
$sign_data = bin2hex($sign);
} else {
$sign_data = '';
}
//释放ssl资源
openssl_free_key($pkeyid);
return $sign_data;
}
/**
* Notes: 银联接口
* @Author: 玄尘
@@ -86,10 +38,10 @@ class UnionPayController extends Controller
unset($inputs['sign']);
$action = new UnionPay($inputs, $sign);
// $action->addLog();
$action->addLog();
$action->start();
// $action->updateLog();
$action->updateLog();
return $action->respond();