gq преди 7 години
родител
ревизия
3791744dd9

+ 7 - 8
server/app/Http/Controllers/Api/V1/MyController.php

xqd xqd
@@ -961,11 +961,11 @@ class MyController extends Controller
             return $this->error(ErrorCode::OPERATION_FAILED);
         }
     } /**
-     * @api {post} /api/my/bank/img 添加二维码
+     * @api {post} /api/my/bank/qrcode 添加二维码
      * @apiDescription 添加二维码
      * @apiGroup My
      *    @apiParam {string} data[type]         类型
-     *    @apiParam {string} data[url]       二维码图片
+     *    @apiParam {string} data[qrcode]       二维码图片
      * @apiPermission Passport
      * @apiVersion 0.1.0
      * @apiSuccessExample {json} Success-Response:
@@ -991,21 +991,20 @@ class MyController extends Controller
         $validator = \Validator::make($request->all(),
             [
                 'data.type'  => 'required',
-                'data.url'  => 'required',
+                'data.qrcode'  => 'required',
             ],
             [
                 'data.type.required'  => '请选择账号类型',
-                'data.url.required'  => '请上传图片',
+                'data.qrcode.required'  => '请上传二维码图片',
             ]
         );
         if($validator->fails()) return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
         $data['user_id'] = $user->id;
-        $data['bank_user'] = '';
+       /* $data['bank_user'] = '';
         $data['bank_phone'] = '';
         $data['bank_number'] = '';
-        $data['bank_name'] = '';
-        $data['is_img'] = 1;
-        $info = UserBank::where('is_img',1)->where('user_id',$user->id)
+        $data['bank_name'] = '';*/
+        $info = UserBank::whereNotNull('qrcode')->where('user_id',$user->id)
             ->where('type',$data['type'])->first();  //定义为二维码
         if (empty($info)) {
             $ok =UserBank::create($data);

+ 2 - 1
server/app/Models/UserBank.php

xqd
@@ -13,6 +13,7 @@ class UserBank extends Model
         'bank_number',
         'bank_phone',
         'bank_user',
-        'is_img',
+        'type',
+        'qrcode',
     ];
 }

+ 7 - 4
server/database/migrations/2017_08_14_113214_create_user_banks_table.php

xqd
@@ -20,11 +20,14 @@ class CreateUserBanksTable extends Migration
         Schema::create('user_banks', function (Blueprint $table) {
             $table->increments('id')->comment('绑定银行卡,支付方式的id');
             $table->unsignedInteger('user_id')->comment('关联用户id, users.id');
-            $table->string('bank_name', 60)->comment('银行名称, 支付方式名称');
-            $table->string('bank_number', 120)->comment('银行卡号码, 支付宝帐号, 微信帐号');
-            $table->string('bank_phone', 120)->comment('银行卡 网上支付绑定的手机号');
-            $table->string('bank_user', 60)->comment('银行卡用户姓名');
+            $table->string('bank_name', 60)->comment('银行名称, 支付方式名称')->nullable();
+            $table->string('bank_number', 120)->comment('银行卡号码, 支付宝帐号, 微信帐号')->nullable();
+            $table->string('bank_phone', 120)->comment('银行卡 网上支付绑定的手机号')->nullable();
+            $table->string('bank_user', 60)->comment('银行卡用户姓名')->nullable();
+            $table->string('type',60)->comment('微信/支付宝')->nullable();
+            $table->string('qrcode')->comment('二维码')->nullable();
             $table->timestamps();
+            $table->softDeletes();
         });
     }
 

+ 0 - 32
server/database/migrations/2017_08_15_165425_add_is_img_to_user_banks.php

xqd
@@ -1,32 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddIsImgToUserBanks extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('user_banks', function (Blueprint $table) {
-            $table->tinyInteger('is_img')->default(0)->nullable()->after('bank_user')->comment('是否图片');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('user_banks', function (Blueprint $table) {
-            //
-        });
-    }
-}

+ 0 - 33
server/database/migrations/2017_08_15_172747_add_is_url_to_user_banks.php

xqd
@@ -1,33 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddIsUrlToUserBanks extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('user_banks', function (Blueprint $table) {
-            $table->string('url')->nullable()->after('bank_user')->comment('图片地址');
-            $table->string('type')->nullable()->after('bank_user')->comment('图片类型');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('user_banks', function (Blueprint $table) {
-            //
-        });
-    }
-}

+ 2 - 2
server/routes/api.php

xqd
@@ -189,8 +189,8 @@ $api->version('v1', ['namespace' => 'App\Http\Controllers\Api\V1'], function ($a
         'as' => 'my.bank_create',
         'uses' => 'MyController@bankCreate',
     ]);
-    $api->post('my/bank/img', [
-        'as' => 'my.bank_create',
+    $api->post('my/bank/qrcode', [
+        'as' => 'my.qrcode',
         'uses' => 'MyController@bankImgCreate',
     ]);
     $api->get('my/bank/delete', [