weizong song 4 years ago
parent 14c5f95c43
commit 260cf68342

BIN
.DS_Store vendored

Binary file not shown.

@ -595,7 +595,8 @@ class OrdersController extends CommonController
"customer_id" => $this->customer->id,
"money" => request()->money,
"order_id" => request()->order_id,
"payment" => "weixin"
"payment" => "weixin",
"merchant_id" => env("WEIXINPAY_MCHID")
]);
$recharge = $recharge->getSerial();

@ -1351,6 +1351,9 @@ class OrdersController extends CommonController
case "weixin":
$res = (new WxMicroPay())->pay($recharge);
if ($res === true) {
$recharge->update([
"merchant_id" => env("WEIXINPAY_MCHID")
]);
return response()->json(true);
} else {
return response()->json([

@ -0,0 +1,32 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class AddMerchantIdToRecharge extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('recharge', function (Blueprint $table) {
$table->string("merchant_id")->nullable();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('recharge', function (Blueprint $table) {
//
});
}
}

BIN
public/.DS_Store vendored

Binary file not shown.

Binary file not shown.

@ -17,7 +17,7 @@
<img style="position: absolute;top: 43%;left: 53%;transform: translate(-50%, -50%);z-index: 1;"
src="https://3gimg.qq.com/lightmap/api_v2/2/4/117/theme/default/imgs/marker.png"
alt="">
<div id="mapcontainer" style="height:200px"></div>
<div id="mapcontainer" style="height:200px; width: 100%;"></div>
</div>
@endif
@endforeach

Loading…
Cancel
Save