|
|
|
|
@ -758,12 +758,12 @@ class OrdersController extends CommonController
|
|
|
|
|
* @OA\Property(
|
|
|
|
|
* property="prepay_total",
|
|
|
|
|
* type="decimal",
|
|
|
|
|
* description="总计需要预扣的金额,入参just_check为1时返回"
|
|
|
|
|
* description="总计需要预扣的金额,入参just_check为1时just_check为0但是客户余额不足时返回"
|
|
|
|
|
* ),
|
|
|
|
|
* @OA\Property(
|
|
|
|
|
* property="customer_balance",
|
|
|
|
|
* type="decimal",
|
|
|
|
|
* description="客户余额,入参just_check为1时返回"
|
|
|
|
|
* description="客户余额,入参just_check为1时just_check为0但是客户余额不足时返回"
|
|
|
|
|
* ),
|
|
|
|
|
* @OA\Property(
|
|
|
|
|
* property="to_recharge_total",
|
|
|
|
|
@ -837,7 +837,9 @@ class OrdersController extends CommonController
|
|
|
|
|
return response()->json([
|
|
|
|
|
"errorcode" => 30002,
|
|
|
|
|
"errormsg" => "余额不足,请先充值",
|
|
|
|
|
"to_recharge_total" => $to_recharge_total,
|
|
|
|
|
"prepay_total" => $prepay_total,
|
|
|
|
|
"customer_balance" => $order->customer->balance,
|
|
|
|
|
"to_recharge_total" => $to_recharge_total
|
|
|
|
|
]);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -850,8 +852,9 @@ class OrdersController extends CommonController
|
|
|
|
|
$service_date = $to_generate_start_date;
|
|
|
|
|
}
|
|
|
|
|
$new_item = (new OrderItems())->createItem($order->id, $service_date);
|
|
|
|
|
$unpaid_order_items->concat($new_item);
|
|
|
|
|
$unpaid_order_items->push($new_item);
|
|
|
|
|
}
|
|
|
|
|
dd($unpaid_order_items);
|
|
|
|
|
|
|
|
|
|
foreach ($unpaid_order_items as $order_item) {
|
|
|
|
|
//更新子订单支付状态
|
|
|
|
|
|