修改新增收货地址
This commit is contained in:
parent
72d142789c
commit
1140e9c7c6
@ -113,7 +113,7 @@ class PatientFamilyRequest extends FormRequest
|
|||||||
'is_default' => ['sometimes',Rule::in(['0', '1'])],
|
'is_default' => ['sometimes',Rule::in(['0', '1'])],
|
||||||
'height' => ['sometimes','numeric'], // 身高
|
'height' => ['sometimes','numeric'], // 身高
|
||||||
'weight' => ['sometimes','numeric'], // 体重
|
'weight' => ['sometimes','numeric'], // 体重
|
||||||
'marital_status' => ['sometimes',Rule::in(['0', '1'])], // 婚姻状况(0:未婚 1:已婚)
|
'marital_status' => ['sometimes',Rule::in(['0', '1','2'])], // 婚姻状况(0:未婚 1:已婚 2:离异)
|
||||||
'is_allergy_history' => ['sometimes','numeric','min:0','max:1'],
|
'is_allergy_history' => ['sometimes','numeric','min:0','max:1'],
|
||||||
'is_family_history' => ['sometimes','numeric','min:0','max:1'],
|
'is_family_history' => ['sometimes','numeric','min:0','max:1'],
|
||||||
// 'is_pregnant' => ['sometimes','numeric','min:0','max:1'],
|
// 'is_pregnant' => ['sometimes','numeric','min:0','max:1'],
|
||||||
|
|||||||
@ -313,7 +313,7 @@ class PatientOrderService extends BaseService
|
|||||||
OrderInquiry::edit($params, $data);
|
OrderInquiry::edit($params, $data);
|
||||||
|
|
||||||
// 检测支付状态,判断是否需要退款处理
|
// 检测支付状态,判断是否需要退款处理
|
||||||
if ($order_inquiry['inquiry_pay_status'] == 2 && $order_inquiry['inquiry_refund_status'] != 3) {
|
if ($order_inquiry['inquiry_pay_status'] == 2 && $order_inquiry['inquiry_refund_status'] != 3 && $order_inquiry['payment_amount_total'] > 0) {
|
||||||
// 需退款
|
// 需退款
|
||||||
$inquiryService = new InquiryService();
|
$inquiryService = new InquiryService();
|
||||||
$inquiryService->inquiryRefund($order_inquiry['order_inquiry_id'], "取消问诊");
|
$inquiryService->inquiryRefund($order_inquiry['order_inquiry_id'], "取消问诊");
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user