| xqd
@@ -16,6 +16,7 @@ use App\Models\ProjectUser;
|
|
|
use App\Models\RentType;
|
|
|
use App\Models\Spec;
|
|
|
use App\Models\WorkPoint;
|
|
|
+use App\User;
|
|
|
use Carbon\Carbon;
|
|
|
use Illuminate\Http\Request;
|
|
|
use Illuminate\Support\Facades\Auth;
|
| xqd
@@ -209,9 +210,50 @@ class OrderController extends BaseController
|
|
|
$item['confirmation_time'] = $item['confirmation_time'] ?$item['confirmation_time']: '暂无';
|
|
|
}
|
|
|
}
|
|
|
- return $this->success(['msg' => '获取年份成功', 'data' => $items]);
|
|
|
+ return $this->success(['msg' => '获取订单阅读总览成功', 'data' => $items]);
|
|
|
|
|
|
}
|
|
|
+ public function getOrderDetails(Request $request)
|
|
|
+ {
|
|
|
+ if ($request->input('date'))
|
|
|
+ {
|
|
|
+ $date = $request->input('date');
|
|
|
+ $date = $date.'-01 00:00:00';
|
|
|
+ }else
|
|
|
+ {
|
|
|
+ $date = '2021-01';
|
|
|
+ $date = $date.'-01 00:00:00';
|
|
|
+ }
|
|
|
+ if ($request->input('project_id'))
|
|
|
+ {
|
|
|
+ $project_id = $request->input('project_id');
|
|
|
+ }else
|
|
|
+ {
|
|
|
+ $project_id = 35;
|
|
|
+ }
|
|
|
+ $before_time = strtotime($date);
|
|
|
+ $now = strtotime('+1 month',$before_time);
|
|
|
+ $now = date('Y-m-d H:i:s',$now);
|
|
|
+ $order_arr = Order::where('project_id',$project_id)
|
|
|
+ ->where('status',3)
|
|
|
+ ->where('type',1)
|
|
|
+ ->where('updated_at','>=',$before_time)
|
|
|
+ ->where('updated_at','<',$now)
|
|
|
+ ->pluck('id')->toArray();
|
|
|
+ $items = OrderDevice::where('project_id',$request->input('project_id'))->whereIn('order_id',$order_arr);
|
|
|
+ $data = [];
|
|
|
+ foreach ($items as &$item) {
|
|
|
+ $device = Device::where('id',$item['device_id'])->value('name');
|
|
|
+ $device_name = DeviceName::where('id',$item['device_name_id'])->value('name');
|
|
|
+ $spec_name = Device::where('id',$item['spec_id'])->value('name');
|
|
|
+ $data['name'] = $device.'-'.$device_name.'-'.$spec_name;
|
|
|
+ $user_id = Order::where('id',$item['order_id'])->value('user_id');
|
|
|
+ $data['user_name'] = User::where('id',$user_id)->value('name');
|
|
|
+ $item->price = ($item->price*$item->quantity)/100;
|
|
|
+ $data['price'] = ($item['price']*$item['quantity'])/100;
|
|
|
+ }
|
|
|
+ return $this->success(['msg' => '获取账单详情成功', 'data' => $data]);
|
|
|
+ }
|
|
|
|
|
|
public function update(Request $request)
|
|
|
{
|