|
|
|
@ -4,6 +4,7 @@
|
|
|
|
namespace App\Http\Controllers\Manager;
|
|
|
|
namespace App\Http\Controllers\Manager;
|
|
|
|
|
|
|
|
|
|
|
|
use AlicFeng\IdentityCard\InfoHelper;
|
|
|
|
use AlicFeng\IdentityCard\InfoHelper;
|
|
|
|
|
|
|
|
use App\Actions\AttachAffectedOrders;
|
|
|
|
use App\Customer;
|
|
|
|
use App\Customer;
|
|
|
|
use App\Events\OrderAssigned;
|
|
|
|
use App\Events\OrderAssigned;
|
|
|
|
use App\Libs\AlipayF2F;
|
|
|
|
use App\Libs\AlipayF2F;
|
|
|
|
@ -542,7 +543,34 @@ class OrdersController extends CommonController
|
|
|
|
* @OA\Parameter(name="price", in="query", @OA\Schema(type="number"), required=true, description="协商价格"),
|
|
|
|
* @OA\Parameter(name="price", in="query", @OA\Schema(type="number"), required=true, description="协商价格"),
|
|
|
|
* @OA\Response(
|
|
|
|
* @OA\Response(
|
|
|
|
* response="200",
|
|
|
|
* response="200",
|
|
|
|
* description="订单修改"
|
|
|
|
* description="订单修改",
|
|
|
|
|
|
|
|
* content={
|
|
|
|
|
|
|
|
* @OA\MediaType(
|
|
|
|
|
|
|
|
* mediaType="application/json",
|
|
|
|
|
|
|
|
* @OA\Schema(
|
|
|
|
|
|
|
|
* @OA\Property(
|
|
|
|
|
|
|
|
* property="errorcode",
|
|
|
|
|
|
|
|
* type="integer",
|
|
|
|
|
|
|
|
* description="错误码;仅在发生错误时发送"
|
|
|
|
|
|
|
|
* ),
|
|
|
|
|
|
|
|
* @OA\Property(
|
|
|
|
|
|
|
|
* property="errormsg",
|
|
|
|
|
|
|
|
* type="string",
|
|
|
|
|
|
|
|
* description="返回消息;有errorcode时为错误内容,无errorcode时为提示内容"
|
|
|
|
|
|
|
|
* ),
|
|
|
|
|
|
|
|
* @OA\Property(
|
|
|
|
|
|
|
|
* property="order.*",
|
|
|
|
|
|
|
|
* type="array",
|
|
|
|
|
|
|
|
* description="订单实体"
|
|
|
|
|
|
|
|
* )
|
|
|
|
|
|
|
|
* @OA\Property(
|
|
|
|
|
|
|
|
* property="affected_orders",
|
|
|
|
|
|
|
|
* type="array",
|
|
|
|
|
|
|
|
* description="特别说明:影响到的订单,如果无此字段或数组为空表示未发生订单影响。影响到的订单实体数组,实体中的change字段(many_to_one或one_to_many)表示影响的方向"
|
|
|
|
|
|
|
|
* )
|
|
|
|
|
|
|
|
* )
|
|
|
|
|
|
|
|
* )
|
|
|
|
|
|
|
|
* }
|
|
|
|
* )
|
|
|
|
* )
|
|
|
|
* )
|
|
|
|
* )
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@ -607,6 +635,7 @@ class OrdersController extends CommonController
|
|
|
|
"status" => Orders::STATUS_ONGOING
|
|
|
|
"status" => Orders::STATUS_ONGOING
|
|
|
|
]);
|
|
|
|
]);
|
|
|
|
event(new OrderAssigned($order));
|
|
|
|
event(new OrderAssigned($order));
|
|
|
|
|
|
|
|
$order = (new AttachAffectedOrders)($order);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
DB::commit();
|
|
|
|
DB::commit();
|
|
|
|
@ -1247,7 +1276,34 @@ class OrdersController extends CommonController
|
|
|
|
* @OA\Parameter(name="paramedic_id", in="query", @OA\Schema(type="integer"), required=true, description="护工id"),
|
|
|
|
* @OA\Parameter(name="paramedic_id", in="query", @OA\Schema(type="integer"), required=true, description="护工id"),
|
|
|
|
* @OA\Response(
|
|
|
|
* @OA\Response(
|
|
|
|
* response="200",
|
|
|
|
* response="200",
|
|
|
|
* description="派单"
|
|
|
|
* description="订单派单",
|
|
|
|
|
|
|
|
* content={
|
|
|
|
|
|
|
|
* @OA\MediaType(
|
|
|
|
|
|
|
|
* mediaType="application/json",
|
|
|
|
|
|
|
|
* @OA\Schema(
|
|
|
|
|
|
|
|
* @OA\Property(
|
|
|
|
|
|
|
|
* property="errorcode",
|
|
|
|
|
|
|
|
* type="integer",
|
|
|
|
|
|
|
|
* description="错误码;仅在发生错误时发送"
|
|
|
|
|
|
|
|
* ),
|
|
|
|
|
|
|
|
* @OA\Property(
|
|
|
|
|
|
|
|
* property="errormsg",
|
|
|
|
|
|
|
|
* type="string",
|
|
|
|
|
|
|
|
* description="返回消息;有errorcode时为错误内容,无errorcode时为提示内容"
|
|
|
|
|
|
|
|
* ),
|
|
|
|
|
|
|
|
* @OA\Property(
|
|
|
|
|
|
|
|
* property="order.*",
|
|
|
|
|
|
|
|
* type="array",
|
|
|
|
|
|
|
|
* description="订单实体"
|
|
|
|
|
|
|
|
* )
|
|
|
|
|
|
|
|
* @OA\Property(
|
|
|
|
|
|
|
|
* property="affected_orders",
|
|
|
|
|
|
|
|
* type="array",
|
|
|
|
|
|
|
|
* description="特别说明:影响到的订单,如果无此字段或数组为空表示未发生订单影响。影响到的订单实体数组,实体中的change字段(many_to_one或one_to_many)表示影响的方向"
|
|
|
|
|
|
|
|
* )
|
|
|
|
|
|
|
|
* )
|
|
|
|
|
|
|
|
* )
|
|
|
|
|
|
|
|
* }
|
|
|
|
* )
|
|
|
|
* )
|
|
|
|
* )
|
|
|
|
* )
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
|