更新

server/app/adminapi/validate/order/OrderValidate.php

@@ -17,7 +17,7 @@ class OrderValidate extends BaseValidate
         'id' => 'require|integer',
         'patient_id' => 'require|integer',
         'patient_id_optional' => 'integer',
-        'order_type' => 'require|in:1,2,3,4,5,6,7',
+        'order_type' => 'require|in:1,2,3,4,5,6,7,8',
         'amount' => 'require|float',
         'status' => 'require|in:1,2,3,4',
         'payment_method' => 'in:alipay,wechat,wechat_work,fubei,manual',
@@ -26,6 +26,8 @@ class OrderValidate extends BaseValidate
         'is_supplement' => 'in:0,1',
         'order_ids' => 'require|array',
         'assistant_id' => 'require|integer|gt:0',
+        'amounts'      => 'require|array',
+        'order_types'  => 'require|array',
     ];
 
     protected $message = [
@@ -47,5 +49,6 @@ class OrderValidate extends BaseValidate
         'refund' => ['id'],
         'delete' => ['id'],
         'assign_assistant' => ['order_ids', 'assistant_id'],
+        'split'            => ['id', 'amounts', 'order_types'],
     ];
 }

server/app/adminapi/validate/tcm/PrescriptionOrderValidate.php

@@ -23,9 +23,9 @@ class PrescriptionOrderValidate extends BaseValidate
         'tracking_number'  => 'max:80',
         'express_company'  => 'max:20',
         'ship_mode'        => 'in:gancao,direct',
-        'fee_type'         => 'require|in:1,2,3,4,5,6,7',
+        'fee_type'         => 'require|in:1,2,3,4,5,6,7,8',
         'amount'           => 'require|float',
-        'order_type'       => 'require|in:1,2,3,4,5,6,7',
+        'order_type'       => 'require|in:1,2,3,4,5,6,7,8',
         'pay_amount'       => 'require|float|gt:0',
         'pay_remark'       => 'max:200',
         'remark_extra'     => 'max:500',
@@ -34,6 +34,7 @@ class PrescriptionOrderValidate extends BaseValidate
         'fulfillment_status' => 'require|integer|in:3,7,8,9,10,11,12',
         'patient_name'     => 'require|max:50',
         'phone'            => 'require|max:20',
+        'phone_tail'       => 'max:20|regex:/^\\d*$/',
     ];
 
     protected $message = [
@@ -47,6 +48,7 @@ class PrescriptionOrderValidate extends BaseValidate
         'action.require' => '请选择审核操作',
         'patient_name.require' => '请输入患者姓名',
         'phone.require' => '请输入手机号',
+        'phone_tail.regex' => '手机后四位仅支持数字',
     ];
 
     protected $scene = [
@@ -61,7 +63,7 @@ class PrescriptionOrderValidate extends BaseValidate
             'is_follow_up', 'prev_staff', 'service_channel', 'service_package',
             'tracking_number', 'express_company', 'fee_type', 'amount', 'remark_extra', 'pay_order_ids',
         ],
-        'logisticsTrace' => ['id'],
+        'logisticsTrace' => ['id', 'phone_tail'],
         'auditPrescription' => ['id', 'action', 'remark'],
         'auditPayment' => ['id', 'action', 'remark'],
         'withdraw' => ['id'],