From 3357a4b95e80fda6e92e60efe4851a5ac74ab97a Mon Sep 17 00:00:00 2001 From: wucongxing8150 <815046773@qq.com> Date: Thu, 9 May 2024 11:17:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E6=9C=AA=E6=8E=A5=E8=AF=8A=E3=80=81?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=94=AF=E4=BB=98=E3=80=81=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E3=80=81=E8=87=AA=E5=8A=A8=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=A2=9E=E5=8A=A0=20=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E5=AD=97=E6=AE=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CancelUnInquiryOrdersDelayDirectConsumer.php | 1 + app/Model/OrderServicePackage.php | 9 +++++---- app/Services/OrderService.php | 1 + app/Services/OrderServicePackageService.php | 1 + 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/Amqp/Consumer/CancelUnInquiryOrdersDelayDirectConsumer.php b/app/Amqp/Consumer/CancelUnInquiryOrdersDelayDirectConsumer.php index 8370632..41733c6 100644 --- a/app/Amqp/Consumer/CancelUnInquiryOrdersDelayDirectConsumer.php +++ b/app/Amqp/Consumer/CancelUnInquiryOrdersDelayDirectConsumer.php @@ -166,6 +166,7 @@ class CancelUnInquiryOrdersDelayDirectConsumer extends ConsumerMessage $order_data = array(); $order_data['cancel_status'] = 1; $order_data['cancel_time'] = date("Y-m-d H:i:s", time()); + $data['cancel_reason'] = 1; // 取消订单原因（1:医生未接受服务 2:主动取消 4:客服取消 5:支付超时） $order_data['cancel_remarks'] = "医生72小时内未接受服务，已进行退款处理，请注意查看账户信息。"; $order_data['updated_at'] = date("Y-m-d H:i:s", time()); diff --git a/app/Model/OrderServicePackage.php b/app/Model/OrderServicePackage.php index 74dd73d..a29cba4 100644 --- a/app/Model/OrderServicePackage.php +++ b/app/Model/OrderServicePackage.php @@ -22,7 +22,7 @@ use Hyperf\Snowflake\Concern\Snowflake; * @property int $order_service_type 服务包类型（1:健康包 2:随访包） * @property int $order_service_status 订单状态（1:待支付 2:未开始 3:服务中 4:服务完成 5:服务取消） * @property int $is_delete 删除状态（0:否 1:是） - * @property int $refund_status 订单退款状态（0:无退款 1:申请退款 2:退款中 3:退款成功 4:拒绝退款 5:退款关闭 6:退款异常） + * @property int $refund_status 订单退款状态（0:无退款 1:申请退款 2:退款中 3:退款成功 4:拒绝退款 5:退款关闭 6:退款异常 7:部分退款） * @property int $pay_channel 支付渠道（1:小程序支付 2:微信扫码支付 3:模拟支付） * @property int $pay_status 支付状态（1:未支付 2:已支付 3:支付中 4:支付失败 5:支付超时 6:支付关闭 7:已撤销 8:转入退款） * @property string $order_service_no 系统订单编号 @@ -34,6 +34,7 @@ use Hyperf\Snowflake\Concern\Snowflake; * @property string $start_time 开始服务时间 * @property string $finish_time 结束服务时间 * @property string $cancel_time 订单取消时间 + * @property int $cancel_reason 取消订单原因（1:医生未接受服务 2:主动取消 4:客服取消 5:支付超时） * @property string $cancel_remarks 取消订单备注 * @property int $add_finish_status 添加完成订单延迟队列状态（0:未添加 1:已添加 2:添加失败） * @property string $add_finish_time 添加完成订单延迟队列时间 @@ -42,8 +43,8 @@ use Hyperf\Snowflake\Concern\Snowflake; * @property string $patient_name_mask 患者姓名-就诊人(掩码) * @property int $patient_sex 患者性别-就诊人（0:未知 1:男 2:女） * @property int $patient_age 患者年龄-就诊人 - * @property Carbon $created_at 创建时间 - * @property Carbon $updated_at 修改时间 + * @property \Carbon\Carbon $created_at 创建时间 + * @property \Carbon\Carbon $updated_at 修改时间 * @property-read OrderServicePackageCase|null $OrderServicePackageCase */ class OrderServicePackage extends Model @@ -58,7 +59,7 @@ class OrderServicePackage extends Model /** * The attributes that are mass assignable. */ - protected array $fillable = ['order_service_id', 'order_id', 'user_id', 'patient_id', 'doctor_id', 'family_id', 'order_service_type', 'order_service_status', 'is_delete', 'refund_status', 'pay_channel', 'pay_status', 'order_service_no', 'escrow_trade_no', 'amount_total', 'coupon_amount_total', 'payment_amount_total', 'pay_time', 'start_time', 'finish_time', 'cancel_time', 'cancel_remarks', 'add_finish_status', 'add_finish_time', 'add_finish_fail_reason', 'patient_name', 'patient_name_mask', 'patient_sex', 'patient_age', 'created_at', 'updated_at']; + protected array $fillable = ['order_service_id', 'order_id', 'user_id', 'patient_id', 'doctor_id', 'family_id', 'order_service_type', 'order_service_status', 'is_delete', 'refund_status', 'pay_channel', 'pay_status', 'order_service_no', 'escrow_trade_no', 'amount_total', 'coupon_amount_total', 'payment_amount_total', 'pay_time', 'start_time', 'finish_time', 'cancel_time', 'cancel_reason', 'cancel_remarks', 'add_finish_status', 'add_finish_time', 'add_finish_fail_reason', 'patient_name', 'patient_name_mask', 'patient_sex', 'patient_age', 'created_at', 'updated_at']; protected string $primaryKey = "order_service_id"; diff --git a/app/Services/OrderService.php b/app/Services/OrderService.php index 119ce32..02db7cf 100644 --- a/app/Services/OrderService.php +++ b/app/Services/OrderService.php @@ -971,6 +971,7 @@ class OrderService extends BaseService $data = array(); $data['order_service_status'] = 5; $data['cancel_time'] = date("Y-m-d H:i:s", time()); + $data['cancel_reason'] = 2; // 取消订单原因（1:医生未接受服务 2:主动取消 4:客服取消 5:支付超时） $data['cancel_remarks'] = "主动取消"; $data['updated_at'] = date("Y-m-d H:i:s", time()); diff --git a/app/Services/OrderServicePackageService.php b/app/Services/OrderServicePackageService.php index d0d7666..cf39244 100644 --- a/app/Services/OrderServicePackageService.php +++ b/app/Services/OrderServicePackageService.php @@ -1228,6 +1228,7 @@ class OrderServicePackageService extends BaseService } $data['cancel_time'] = date("Y-m-d H:i:s", time()); + $data['cancel_reason'] = $cancel_reason; // 取消订单原因（1:医生未接受服务 2:主动取消 4:客服取消 5:支付超时） $data['cancel_remarks'] = $cancel_remarks; // 取消订单备注 $data['updated_at'] = date("Y-m-d H:i:s", time());