Browse Source

FIXED

master
weigang 5 years ago
parent
commit
25dced8dd7
  1. 1
      app/Controller/v3/NotifyController.php
  2. 2
      app/Controller/v3/OrderOnlineController.php
  3. 2
      app/Controller/v3/WithdrawController.php
  4. 2
      app/Service/v3/Implementations/OrderListService.php
  5. 2
      app/Service/v3/Implementations/PaymentService.php

1
app/Controller/v3/NotifyController.php

@ -288,7 +288,6 @@ class NotifyController extends BaseController
{
$config = config('wxpay');
var_dump('wxpay$config', $config);
$app = Factory::payment($config);
$app['guzzle_handler'] = CoroutineHandler::class;

2
app/Controller/v3/OrderOnlineController.php

@ -234,7 +234,7 @@ class OrderOnlineController extends BaseController
Db::rollBack();
$this->log->event(LogLabel::ORDER_COMPLETE_LOG, ['exception' => $e->getMessage()]);
throw new ErrorCodeException(ErrorCode::ORDER_COMPLETE_FAIL, $e->getMessage());
throw new ErrorCodeException(ErrorCode::ORDER_COMPLETE_FAIL);
}
}
}

2
app/Controller/v3/WithdrawController.php

@ -194,7 +194,7 @@ class WithdrawController extends BaseController
'withdraw' => json_encode($withdraw),
'params' => json_encode(['balance' => $balance->balance, 'user_id' => $userId, 'store_id' => $storeId]),
]);
throw new ErrorCodeException(ErrorCode::STORE_WITHDRAW_FAIL, '[请稍后重试]'.$e->getMessage());
throw new ErrorCodeException(ErrorCode::STORE_WITHDRAW_FAIL);
}
}

2
app/Service/v3/Implementations/OrderListService.php

@ -68,7 +68,7 @@ class OrderListService implements OrderListServiceInterface
$paginate = $builder->orderBy('created_at', 'desc')->paginate($pagesize);
$orders = $paginate->toArray();
return ['has_more_pages' => $paginate->hasMorePages(), 'orders' => $orders['data']];
return ['has_more_pages' => $paginate->hasMorePages(), 'orders' => $orders['data'], 'note' => '待付款订单15分钟后将自动取消,请尽快支付!'];
}
public function onlineByStore($storeId, $tab, $page=1, $pagesize=10)

2
app/Service/v3/Implementations/PaymentService.php

@ -144,7 +144,7 @@ class PaymentService implements PaymentServiceInterface
}
} catch (\Exception $e) {
$this->log->event(LogLabel::ORDER_REFUND_LOG, ['payment_do_exception_msg' => $e->getMessage()]);
throw new ErrorCodeException(ErrorCode::REFUND_PAYMENT_FAIL, '[退款失败]'.$e->getMessage());
throw new ErrorCodeException(ErrorCode::REFUND_PAYMENT_FAIL);
}
}

Loading…
Cancel
Save