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:
admin
2023-04-07 10:46:19 +08:00
parent 5ddc4d1c0a
commit 5776001cfe
10 changed files with 171 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Model/MessageNotice.php
+1 -1
View File
@@ -100,7 +100,7 @@ class MessageNotice extends Model
public static function getMessageNoticePage(array $params, array $fields = ["*"], int $page = null, ?int $per_page = 10): array
{
$results = self::where($params)
->orderBy('notice_send_time')
->orderBy('notice_send_time','desc')
->paginate($per_page, $fields, "page", $page);
$data = array();
app/Model/OrderInquiry.php
+20 -5
View File
@@ -33,9 +33,10 @@ use Hyperf\Snowflake\Concern\Snowflake;
* @property string $reception_time 接诊时间（已接诊）
* @property string $complete_time 订单完成时间（问诊完成时间）
* @property string $finish_time 订单结束时间
* @property string $settlement_amount_total 订单与医生结算金额
* @property int $settlement_status 订单与医生结算状态（0:未结算 1:已结算）
* @property string $settlement_time 订单与医生结算时间
* @property int $statistics_status 订单统计状态（0:未统计 1:已统计 2:统计失败）
* @property string $statistics_time 订单统计时间
* @property int $is_withdrawal 是否提现（0:否 1:是 2:提现中）
* @property string $withdrawal_time 提现时间
* @property string $cancel_time 订单取消时间
* @property int $cancel_reason 取消订单原因（1:医生未接诊 2:主动取消 3:无可分配医生 4:客服取消 5:支付超时）
* @property string $cancel_remarks 取消订单备注（自动添加）
@@ -60,7 +61,7 @@ class OrderInquiry extends Model
/**
* The attributes that are mass assignable.
*/
protected array $fillable = ['order_inquiry_id', 'user_id', 'patient_id', 'doctor_id', 'family_id', 'inquiry_type', 'inquiry_mode', 'inquiry_status', 'is_delete', 'inquiry_refund_status', 'inquiry_pay_channel', 'inquiry_pay_status', 'inquiry_no', 'escrow_trade_no', 'amount_total', 'coupon_amount_total', 'payment_amount_total', 'pay_time', 'reception_time', 'complete_time', 'finish_time', 'settlement_amount_total', 'settlement_status', 'settlement_time', 'cancel_time', 'cancel_reason', 'cancel_remarks', 'patient_name', 'patient_name_mask', 'patient_sex', 'patient_age', 'created_at', 'updated_at'];
protected array $fillable = ['order_inquiry_id', 'user_id', 'patient_id', 'doctor_id', 'family_id', 'inquiry_type', 'inquiry_mode', 'inquiry_status', 'is_delete', 'inquiry_refund_status', 'inquiry_pay_channel', 'inquiry_pay_status', 'inquiry_no', 'escrow_trade_no', 'amount_total', 'coupon_amount_total', 'payment_amount_total', 'pay_time', 'reception_time', 'complete_time', 'finish_time', 'statistics_status', 'statistics_time', 'is_withdrawal', 'withdrawal_time', 'cancel_time', 'cancel_reason', 'cancel_remarks', 'patient_name', 'patient_name_mask', 'patient_sex', 'patient_age', 'created_at', 'updated_at'];
protected string $primaryKey = "order_inquiry_id";
@@ -193,7 +194,7 @@ class OrderInquiry extends Model
* @param array $inquiry_status_params inquiry_status字段搜索条件
* @return int|mixed|string
*/
public static function getOrderInquiryAmountTotalSum(array $params, array $reception_time,array $inquiry_status_params): mixed
public static function getOrderInquiryBetweenTimeAmountTotalSum(array $params, array $reception_time, array $inquiry_status_params): mixed
{
return self::where($params)
->whereIn('inquiry_status',$inquiry_status_params)
@@ -202,6 +203,20 @@ class OrderInquiry extends Model
->sum("amount_total");
}
/**
* 获取医生某种状态的订单金额
* @param array $params
* @param array $inquiry_status_params inquiry_status字段搜索条件
* @return int|mixed|string
*/
public static function getOrderInquiryAmountTotalSum(array $params, array $inquiry_status_params): mixed
{
return self::where($params)
->whereIn('inquiry_status',$inquiry_status_params)
->orderBy('reception_time')
->sum("amount_total");
}
/**
* 获取某种状态的所有订单
* @param array $params