调整查询平安券返回值

This commit is contained in:
2023-02-24 14:25:39 +08:00
parent 295ad2b23f
commit a7719d7038

View File

@@ -23,7 +23,7 @@ class UserController extends Controller
public function check(Request $request)
{
$res = $this->checkSign($request);
if (!is_array($res)) {
if (! is_array($res)) {
return $this->error($res);
}
$user_id = $res['user_id'];
@@ -34,6 +34,7 @@ class UserController extends Controller
/**
* Notes: 发券
*
* @Author: 玄尘
* @Date : 2020/6/29 13:57
*/
@@ -75,9 +76,10 @@ class UserController extends Controller
/**
* Notes: 查询
*
* @Author: 玄尘
* @Date : 2020/7/22 11:23
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Http\Request $request
*/
public function query(Request $request)
{
@@ -106,13 +108,43 @@ class UserController extends Controller
$redemptionCode = $res['redemptionCode'];
$outletId = $res['outletId'];
$res = Coupon::Query($redemptionCode, $outletId);
try {
$res = Coupon::Query($redemptionCode, $outletId);
if (is_string($res)) {
return $this->error($res, $log);
if (is_string($res)) {
return $this->error($res, $log);
}
if (isset($res['productItemList'])) {
$ticket = explode('-', $res['productItemList'][0]['thirdPartyGoodsId']);
$full = $ticket[1]; //full100
$price = $ticket[2];
preg_match('/\d+/', $full, $result);
$status = [
0 => 1,
1 => 2,
2 => 2,
3 => 3,
4 => 3,
][$res['status']];
$res = [
'name' => $res['couponName'],
'code' => $res['redemptionCode'],
'full' => $result[0],
'price' => $price,
'status' => $status,
'used_at' => $res['issueDate'],
'startTime' => $res['startTime'],
'endTime' => $res['endTime'],
];
}
return $this->success($res, $log);
} catch (\Exception $exception) {
return $this->error($exception->getMessage(), $log);
}
return $this->success($res, $log);
}
//作废
@@ -160,7 +192,7 @@ class UserController extends Controller
//插入日志表
$log = $this->createLog($request->url(), 'POST', $inputdata, 'freezecoupon'); //添加日志
if (!is_array($res)) {
if (! is_array($res)) {
return $this->error($res, $log);
}