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

'调整了一些bug'

Browse Source
This commit is contained in:
徐永宾
2020-08-21 15:45:30 +08:00
parent 1f2c1c0055
commit 60b1518028
16 changed files with 103 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Api/Controllers/UserController.php
View File

@@ -41,7 +41,7 @@ class UserController extends Controller
{
$inputdata = $request->all();
$res = $this->checkSign($request);
$inputdata['jiemi'] = $res;
$log = $this->createLog($request->url(), 'POST', $inputdata, 'grant'); //添加日志
@@ -166,10 +166,12 @@ class UserController extends Controller
'redemptionCode' => 'required',
'total' => 'required',
'outletId' => 'required',
'orderid' => 'nullable|min:10',
], [
'redemptionCode.required' => '缺少卡券兑换码',
'total.required' => '缺少订单总额',
'outletId.required' => '缺少网点id',
'orderid.min' => '订单id长度不能超过100个字符',
]);
if ($validator->fails()) {
@@ -179,10 +181,12 @@ class UserController extends Controller
$redemptionCode = $res['redemptionCode'] ?? ''; //'915400693355';
$total = $res['total'] ?? ''; //订单总额;
$outletId = $res['outletId'] ?? ''; //网点id;
$orderid = $res['orderid'] ?? ''; //订单id;
$redemptionCode = trim($redemptionCode);
$outletId = trim($outletId);
$coupon = Coupon::Redemption($this->user, $redemptionCode, $total, $outletId);
$coupon = Coupon::Redemption($this->user, $redemptionCode, $total, $outletId, $orderid);
if (is_string($coupon)) {
return $this->error($coupon, $log);
}