pdkj
/
jiqu-library-server
6
0
Fork 0
Code Releases Activity

add migration

release
panliang 2022-05-07 13:57:54 +08:00
parent b8cd92a70a
commit 50fb013f22
5 changed files with 141 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/Admin/Controllers/UserController.php
View File

@ -61,24 +61,24 @@ class UserController extends AdminController
$modal->title('消费值');
return UserSalesValueLogSimpleTable::make(['id'=>$this->id]);
})->setHeaderAttributes(['style' => 'color:#5b69bc']);
$grid->column('wallet.balance')->display(function ($value) {
$value = bcdiv($value, 100, 2);
if ($this->wallet?->is_frozen) {
$value .= " &nbsp;<span class='label' style='background:#b3b9bf'>冻结</span>";
}
return $value;
})->prepend('￥')->filter(
PriceBetween::make()
);
$grid->column('balance.balance')->display(function ($value) {
$value = bcdiv($value, 100, 2);
if ($this->balance?->is_frozen) {
$value .= " &nbsp;<span class='label' style='background:#b3b9bf'>冻结</span>";
}
return $value;
})->prepend('￥')->filter(
PriceBetween::make()
);
// $grid->column('wallet.balance')->display(function ($value) {
// $value = bcdiv($value, 100, 2);
// if ($this->wallet?->is_frozen) {
// $value .= " &nbsp;<span class='label' style='background:#b3b9bf'>冻结</span>";
// }
// return $value;
// })->prepend('￥')->filter(
// PriceBetween::make()
// );
// $grid->column('balance.balance')->display(function ($value) {
// $value = bcdiv($value, 100, 2);
// if ($this->balance?->is_frozen) {
// $value .= " &nbsp;<span class='label' style='background:#b3b9bf'>冻结</span>";
// }
// return $value;
// })->prepend('￥')->filter(
// PriceBetween::make()
// );
$grid->column('created_at')->sortable();
$grid->column('register_ip');
@ -217,11 +217,11 @@ class UserController extends AdminController
$form->display('id');
// $form->text('username');
$form->mobile('phone')->rules('unique:users,phone')->required();
$form->password('password')->required();
// $form->password('password')->required();
// 设置错误信息
$form->password('password_confirm')->same('password', '两次密码输入不一致')->required();
// $form->password('password_confirm')->same('password', '两次密码输入不一致')->required();
$form->text('code', '邀请码');
$form->ignore(['password_confirm']);
// $form->ignore(['password_confirm']);
$form->display('created_at');
$form->display('updated_at');

11
app/Endpoint/Api/Http/Controllers/Auth/MiniprogramController.php
View File

@ -107,11 +107,14 @@ class MiniprogramController extends Controller
'status_remark' => '手机号重复: ' . $phone
]);
}
if ($user->phone !== $phone) {
$user->update([
'phone' => $phone,
'phone_verified_at' => now(),
]);
}
$user->update([
'phone' => $phone,
'phone_verified_at' => now(),
]);
DB::commit();
return response()->noContent();
} catch (Throwable $e) {

38
database/migrations/2022_05_06_133819_add_role_to_user_infos.php 100644
View File

@ -0,0 +1,38 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class AddRoleToUserInfos extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('user_infos', function (Blueprint $table) {
// type: favoite, agent
// level: v3, v2, v1
$table->string('role')->default('')->comment('分销身份({type}-{level})');
$table->string('role_name')->default('');
$table->decimal('profit', 12, 2)->default(0)->comment('累计收益');
$table->tinyInteger('is_company')->default(0)->comment('是否员工');
$table->unsignedBigInteger('store_id')->nullable()->comment('关联门店');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('user_infos', function (Blueprint $table) {
$table->dropColumn(['role', 'role_name', 'profit', 'store_id']);
});
}
}

42
database/migrations/2022_05_06_150951_create_order_profits_table.php 100644
View File

@ -0,0 +1,42 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateOrderProfitsTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('order_profits', function (Blueprint $table) {
$table->id();
$table->unsignedBigInteger('order_id')->comment('订单ID');
$table->unsignedBigInteger('from_user_id')->comment('下单用户');
$table->unsignedBigInteger('user_id')->comment('收益用户');
$table->string('role')->default('')->comment('收益用户身份');
$table->string('role_name')->default('');
$table->decimal('growth_value', 12, 2)->comment('成长值');
$table->integer('ratio')->comment('比例');
$table->decimal('money', 12, 2)->comment('收益金额');
$table->tinyInteger('status')->default(0)->comment('状态(0: 待付款, 1: 付款中, 2: 已付款)');
$table->timestamp('paid_at')->nullable()->comment('付款时间');
$table->text('pay_data')->nullable()->comment('支付信息{pay_way, pay_sn}');
$table->timestamps();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('order_profits');
}
}

33
database/migrations/2022_05_06_160615_add_invitor_id_to_orders.php 100644
View File

@ -0,0 +1,33 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class AddInvitorIdToOrders extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('orders', function (Blueprint $table) {
$table->unsignedBigInteger('store_id')->nullable()->comment('关联门店');
$table->unsignedBigInteger('inviter_id')->nullable()->comment('关联员工');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('orders', function (Blueprint $table) {
$table->dropColumn(['store_id', 'inviter_id']);
});
}
}