diff --git a/.DS_Store b/.DS_Store index 4d6a3e8..e2604b9 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/app/Http/Controllers/Customer/OrdersController.php b/app/Http/Controllers/Customer/OrdersController.php index 72e1124..04e63af 100644 --- a/app/Http/Controllers/Customer/OrdersController.php +++ b/app/Http/Controllers/Customer/OrdersController.php @@ -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(); diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php index 1056a29..c8ba9cb 100644 --- a/app/Http/Controllers/Manager/OrdersController.php +++ b/app/Http/Controllers/Manager/OrdersController.php @@ -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([ diff --git a/database/migrations/2022_03_01_073747_add_merchant_id_to_recharge.php b/database/migrations/2022_03_01_073747_add_merchant_id_to_recharge.php new file mode 100644 index 0000000..ab473e1 --- /dev/null +++ b/database/migrations/2022_03_01_073747_add_merchant_id_to_recharge.php @@ -0,0 +1,32 @@ +string("merchant_id")->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('recharge', function (Blueprint $table) { + // + }); + } +} diff --git a/public/.DS_Store b/public/.DS_Store index 5200aaf..5e1a8f6 100644 Binary files a/public/.DS_Store and b/public/.DS_Store differ diff --git a/public/hyper/.DS_Store b/public/hyper/.DS_Store index e543225..1cc6564 100644 Binary files a/public/hyper/.DS_Store and b/public/hyper/.DS_Store differ diff --git a/resources/views/admin/project/create.blade.php b/resources/views/admin/project/create.blade.php index 84f905c..893d80b 100755 --- a/resources/views/admin/project/create.blade.php +++ b/resources/views/admin/project/create.blade.php @@ -17,7 +17,7 @@ -
+
@endif @endforeach