|
@@ -34,7 +34,7 @@ class PaymentOrder extends Controller
|
|
|
PaymentOrderModel::whereIn('id', $params['ids'])
|
|
PaymentOrderModel::whereIn('id', $params['ids'])
|
|
|
->where('payment_type', $params['payment_type'])
|
|
->where('payment_type', $params['payment_type'])
|
|
|
->where('status', 0)
|
|
->where('status', 0)
|
|
|
- ->update(['pay_data' => $params['pay_data'], 'status' => 1]);
|
|
|
|
|
|
|
+ ->update(['pay_data' => $params['pay_data'], 'status' => 4, 'is_send' => 0]);
|
|
|
|
|
|
|
|
DB::commit();
|
|
DB::commit();
|
|
|
} catch (ValidationException $e) {
|
|
} catch (ValidationException $e) {
|
|
@@ -60,7 +60,7 @@ class PaymentOrder extends Controller
|
|
|
$remark = $params['remark'] ?? '';
|
|
$remark = $params['remark'] ?? '';
|
|
|
$info = PaymentOrderModel::find($params['id']);
|
|
$info = PaymentOrderModel::find($params['id']);
|
|
|
if (!$info) throw new Exception('数据不存在', HttpStatus::CUSTOM_ERROR);
|
|
if (!$info) throw new Exception('数据不存在', HttpStatus::CUSTOM_ERROR);
|
|
|
- if ($info->status != 4) throw new Exception('用户未提交充值凭证', HttpStatus::CUSTOM_ERROR);
|
|
|
|
|
|
|
+ if ($info->status != 5) throw new Exception('用户未提交充值凭证', HttpStatus::CUSTOM_ERROR);
|
|
|
if ($info->payment_type == 0) throw new Exception('当前订单非人工充值,无法操作', HttpStatus::CUSTOM_ERROR);
|
|
if ($info->payment_type == 0) throw new Exception('当前订单非人工充值,无法操作', HttpStatus::CUSTOM_ERROR);
|
|
|
if ($params['status'] == 3) {
|
|
if ($params['status'] == 3) {
|
|
|
if (empty($remark)) {
|
|
if (empty($remark)) {
|
|
@@ -74,7 +74,6 @@ class PaymentOrder extends Controller
|
|
|
$info->status = $params['status'];
|
|
$info->status = $params['status'];
|
|
|
$info->remark = $remark;
|
|
$info->remark = $remark;
|
|
|
$info->state = 1;
|
|
$info->state = 1;
|
|
|
- $info->is_send = 0;//标记发送通知
|
|
|
|
|
$info->save();
|
|
$info->save();
|
|
|
|
|
|
|
|
$memberId = $info->member_id;
|
|
$memberId = $info->member_id;
|