|
|
@@ -192,6 +192,7 @@ class BalanceLogService extends BaseService
|
|
|
$realname = isset($userInfo['realname']) ? $userInfo['realname'] : '';
|
|
|
$orderStatus = isset($info['status']) ? $info['status'] : 0;
|
|
|
$accountType = isset($info['account_type']) ? $info['account_type'] : 0;
|
|
|
+ $payType = isset($info['pay_type']) ? $info['pay_type'] : 10;
|
|
|
$orderUserId = isset($info['user_id']) ? $info['user_id'] : 0;
|
|
|
$orderNo = isset($info['order_no']) ? $info['order_no'] : '';
|
|
|
$money = isset($info['money']) ? $info['money'] : 0;
|
|
|
@@ -220,7 +221,7 @@ class BalanceLogService extends BaseService
|
|
|
}
|
|
|
|
|
|
DB::beginTransaction();
|
|
|
- $status = $payStatus == 20 && $status == 2 ? 4 : $status;
|
|
|
+ $status = $payStatus == 20 && $status == 2 && $payType!=10 ? 4 : $status;
|
|
|
$updateData = ['status' => $status, 'pay_status' => $payStatus, 'pay_img' => $payImg, 'confirm_admin_id' => $adminId, 'update_time' => time(), 'confirm_remark' => $confirmRemark];
|
|
|
if (!$this->model->where(['id' => $id])->update($updateData)) {
|
|
|
DB::rollBack();
|
