gdxz/hospital-applets-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改登录时优惠卷发放时机

Browse Source
This commit is contained in:
wucongxing 2023-04-27 18:42:14 +08:00
parent 0bb46d2706
commit fc165bd067
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Model/OrderProduct.php
View File

@ -163,6 +163,7 @@ class OrderProduct extends Model
"OrderProductItem:product_item_id,order_product_id,product_id,product_name,amount,manufacturer,product_cover_img,product_spec", "OrderProductItem:product_item_id,order_product_id,product_id,product_name,amount,manufacturer,product_cover_img,product_spec",
]) ])
->where($params) ->where($params)
->orderBy("created_at",'desc')
->paginate($per_page, $fields, "page", $page); ->paginate($per_page, $fields, "page", $page);
$data = array(); $data = array();

40
app/Services/LoginService.php
View File

@ -104,15 +104,6 @@ class LoginService extends BaseService
return fail(HttpEnumCode::SERVER_ERROR); return fail(HttpEnumCode::SERVER_ERROR);
} }
$client_user_id = $user_patient['patient_id']; $client_user_id = $user_patient['patient_id'];
// 发放用户优惠卷
$CouponService = new CouponService();
$res = $CouponService->DistributeCoupon(1,$user->user_id,$user_patient['patient_id']);
if (!$res){
Db::rollBack();
return fail(HttpEnumCode::SERVER_ERROR);
}
} elseif ($user['user_type'] == 2) { } elseif ($user['user_type'] == 2) {
// 新增医生表 // 新增医生表
$user_doctor = UserDoctorModel::addUserDoctor($data); $user_doctor = UserDoctorModel::addUserDoctor($data);
@ -128,6 +119,17 @@ class LoginService extends BaseService
$account = new Account(); $account = new Account();
// 创建单个账号 // 创建单个账号
$account->createAccount($user->user_id,$user->user_name,addAliyunOssWebsite($avatar)); $account->createAccount($user->user_id,$user->user_name,addAliyunOssWebsite($avatar));
if ($user['user_type'] == 1){
// 发放用户优惠卷
$CouponService = new CouponService();
$res = $CouponService->DistributeCoupon(1,$user->user_id,$user_patient['patient_id']);
if (!$res){
Db::rollBack();
return fail(HttpEnumCode::SERVER_ERROR);
}
}
} else { } else {
// 已注册用户 // 已注册用户
// 重复注册不同端 // 重复注册不同端
@ -318,15 +320,6 @@ class LoginService extends BaseService
return fail(HttpEnumCode::SERVER_ERROR); return fail(HttpEnumCode::SERVER_ERROR);
} }
$client_user_id = $user_patient['patient_id']; $client_user_id = $user_patient['patient_id'];
// 发放用户优惠卷
$CouponService = new CouponService();
$res = $CouponService->DistributeCoupon(1,$user->user_id,$user_patient['patient_id']);
if (!$res){
Db::rollBack();
return fail(HttpEnumCode::SERVER_ERROR);
}
} elseif ($user['user_type'] == 2) { } elseif ($user['user_type'] == 2) {
// 新增医生表 // 新增医生表
$user_doctor = UserDoctorModel::addUserDoctor($data); $user_doctor = UserDoctorModel::addUserDoctor($data);
@ -347,6 +340,17 @@ class LoginService extends BaseService
$account = new Account(); $account = new Account();
// 创建单个账号 // 创建单个账号
$account->createAccount($user->user_id,$user->user_name,addAliyunOssWebsite($avatar)); $account->createAccount($user->user_id,$user->user_name,addAliyunOssWebsite($avatar));
if ($user['user_type'] == 1){
// 发放用户优惠卷
$CouponService = new CouponService();
$res = $CouponService->DistributeCoupon(1,$user->user_id,$user_patient['patient_id']);
if (!$res){
Db::rollBack();
return fail(HttpEnumCode::SERVER_ERROR);
}
}
} else { } else {
// 已注册用户 // 已注册用户
if ($user_type != $user['user_type']) { if ($user_type != $user['user_type']) {