transfer
This commit is contained in:
parent
553d503998
commit
4639ed83f2
@ -273,10 +273,17 @@ class EarningController extends Controller
|
|||||||
public function MyWithdraws(Request $request)
|
public function MyWithdraws(Request $request)
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
|
$appId = config("service_payment.app_id");
|
||||||
|
$mchId = config("service_payment.mch_id");
|
||||||
$merchant_id = $request->merchant_id ?? 0;
|
$merchant_id = $request->merchant_id ?? 0;
|
||||||
$merchant_user_id = $request->merchant_user_id ?? 0;
|
$merchant_user_id = $request->merchant_user_id ?? 0;
|
||||||
$result = MEarningwithdraws::whereIn('status', ['finished', 'freezing', "wait_user_confirm"])->where('m_id', $merchant_id)->where('m_user_id', $merchant_user_id)->paginate();
|
$list = MEarningwithdraws::whereIn('status', ['finished', 'freezing', "wait_user_confirm"])->where('m_id', $merchant_id)->where('m_user_id', $merchant_user_id)->paginate();
|
||||||
return $this->success('ok', $result);
|
foreach ($list as $item) {
|
||||||
|
$item->app_id = $appId;
|
||||||
|
$item->mch_id = $mchId;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->success('ok', $list);
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
$this->getError($e);
|
$this->getError($e);
|
||||||
return $this->failure('服务器休息中,请稍后再试');
|
return $this->failure('服务器休息中,请稍后再试');
|
||||||
@ -650,7 +657,9 @@ class EarningController extends Controller
|
|||||||
$withdraw->status = "wait_user_confirm";
|
$withdraw->status = "wait_user_confirm";
|
||||||
$withdraw->save();
|
$withdraw->save();
|
||||||
DB::commit();
|
DB::commit();
|
||||||
return $this->success('ok', ['status' => 1, "package_info" => $package_info, "app_id" => "wx36c72a00f1b2be64", "mch_id" => "1581903621"]);
|
$appId = config("service_payment.app_id");
|
||||||
|
$mchId = config("service_payment.mch_id");
|
||||||
|
return $this->success('ok', ['status' => 1, "package_info" => $package_info, "app_id" => $appId, "mch_id" => $mchId]);
|
||||||
|
|
||||||
// //修改账号状态
|
// //修改账号状态
|
||||||
// $earning_account->decrement('frozen_withdraw', $amount);
|
// $earning_account->decrement('frozen_withdraw', $amount);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user