diff --git a/app/Dicts.php b/app/Dicts.php index 8134e3dc..323546e3 100644 --- a/app/Dicts.php +++ b/app/Dicts.php @@ -20,7 +20,7 @@ class Dicts extends Repository 'weekIso' => ['周一', '周二', '周三', '周四', '周五', '周六', '周日'], 'pay_channel' => ['银行转账' => ['bank'], '余额支付' => ['account'], '微信支付' => ['wx', 'wx_pub', 'wx_pub_qr', 'wx_pub_scan', 'wx_wap', 'wx_lite'], '支付宝' => ['alipay', 'alipay_wap', 'alipay_qr', 'alipay_scan', 'alipay_pc_direct'], '天猫续费' => ['tmall']], 'carrier_operator' => ['联通', '移动', '电信', '全网'], - 'fType' => ['流量','硬件'], + 'flow_type' => ['流量','硬件'], 'service_type' => ['套餐开通', '套餐续费', '套餐更换', '套餐销售'], 'card_status' => ['测试期', '沉默期', '服务期', '服务到期', '已注销'], 'package_type' => ['基础套餐', '续费包', '加油包', '可选包', '附加包'], diff --git a/app/Domains/Stats/Http/Controllers/CompanyReportController.php b/app/Domains/Stats/Http/Controllers/CompanyReportController.php index 288800ab..4053489f 100644 --- a/app/Domains/Stats/Http/Controllers/CompanyReportController.php +++ b/app/Domains/Stats/Http/Controllers/CompanyReportController.php @@ -31,7 +31,7 @@ class CompanyReportController extends Controller public function index() { $conditions = $this->request->all(); - $conditions['type'] = $this->request->ids('type'); + $conditions['virtual_order_cards_partition.type'] = $this->request->ids('type'); $res = $this->companyReportService->index($conditions); diff --git a/app/Domains/Virtual/Repositories/Concerns/OrderCardConcern.php b/app/Domains/Virtual/Repositories/Concerns/OrderCardConcern.php index ebb0d471..0751ac7c 100644 --- a/app/Domains/Virtual/Repositories/Concerns/OrderCardConcern.php +++ b/app/Domains/Virtual/Repositories/Concerns/OrderCardConcern.php @@ -27,6 +27,15 @@ trait OrderCardConcern $orgModel = $this->getModel(); $this->model = $this->model->where(function ($query) use ($conditions, $orgModel) { + //套餐表的流量套餐类型 + if (isset($conditions['flow_type'])){ + $hasRaw = sprintf("exists (SELECT id FROM virtual_packages WHERE %s.package_id = virtual_packages.id AND virtual_packages.flow_type = %d)", + $orgModel->getTable(), + $conditions['flow_type']); + $query->whereRaw($hasRaw); + } + + if (isset($conditions['id'])) { $conditions['id'] = array_wrap($conditions['id']); $query->whereIn('id', $conditions['id']); diff --git a/app/Domains/Virtual/Repositories/PackageRepository.php b/app/Domains/Virtual/Repositories/PackageRepository.php index 98b9814b..94d91be6 100644 --- a/app/Domains/Virtual/Repositories/PackageRepository.php +++ b/app/Domains/Virtual/Repositories/PackageRepository.php @@ -77,6 +77,11 @@ class PackageRepository extends Repository $this->model = $this->model->where('carrier_operator', $conditions['carrier_operator']); } + //流量套餐类型,0流量,1硬件 + if (isset($conditions['flow_type'])) { + $this->model = $this->model->where('flow_type',$conditions['flow_type']); + } + if (isset($conditions['status'])) { $this->model = $this->model->where('status', $conditions['status']); } diff --git a/app/Domains/Virtual/Services/PackageService.php b/app/Domains/Virtual/Services/PackageService.php index a185d3b4..4559c6f9 100644 --- a/app/Domains/Virtual/Services/PackageService.php +++ b/app/Domains/Virtual/Services/PackageService.php @@ -43,14 +43,15 @@ class PackageService extends Service $carrierOperators = app(Dicts::class)->get('carrier_operator'); //流量套餐[0流量1硬件] - $fTypeName = app(Dicts::class)->get('fType'); + $flowTypeName = app(Dicts::class)->get('flow_type'); - $packages->map(function ($item) use ($carrierOperators,$fTypeName){ + $packages->map(function ($item) use ($carrierOperators,$flowTypeName){ $item->cost_price = sprintf('%.02f', $item->cost_price/100); $item->guide_price = sprintf('%.02f', $item->guide_price/100); $item->carrier_operator_name = $carrierOperators[$item->carrier_operator]; //显示对应的中文名称-流量套餐 - $item->ftype = $fTypeName[$item->ftype]; + $item->flow_type = $item->flow_type; + $item->flow_type_name = $flowTypeName[$item->flow_type]; $item->status = $item->deleted_at ? 2 : $item->status; $item->created_at = Carbon::parse($item->created_at)->format('Y-m-d'); $item->updated_at = Carbon::parse($item->updated_at)->format('Y-m-d'); @@ -82,7 +83,7 @@ class PackageService extends Service 'sn' => ['required', 'between:2,32', Rule::unique($this->packageRepository->getTable(), 'sn')->ignore($attributes['id'])->whereNUll('deleted_at')], 'name' => ['required', 'between:2,32', Rule::unique($this->packageRepository->getTable(), 'name')->ignore($attributes['id'])->whereNUll('deleted_at')], 'type' => ['required', 'in:0,2,3'], - 'fType' => ['required', 'in:0,1'], + 'flow_type' => ['required', 'in:0,1'], 'carrier_operator' => ['required', 'in:0,1,2,3'], // 'package_type' => ['required', 'numeric'], 'cost_price' => ['numeric', 'min:0'], @@ -107,8 +108,9 @@ class PackageService extends Service 'name.between' => '套餐名称长度不合法', 'name.unique' => '套餐名称已经被其他用户所使用', 'type.required' => '请选择套餐类型', - 'fType.required' => '请选择流量套餐类型', 'type.in' => '套餐类型不合法', + 'flow_type.required' => '请选择流量套餐类型', + 'flow_type.in' => '流量套餐类型不合法', 'carrier_operator.required' => '请选择运营商', 'carrier_operator.in' => '运营商不合法', 'package_type.required' => '请选择套餐类型', @@ -123,6 +125,7 @@ class PackageService extends Service $attributes['cost_price'] = intval($attributes['cost_price'] * 100); $attributes['guide_price'] = intval($attributes['guide_price'] * 100); $attributes['package_type'] = intval($attributes['package_type']); + $attributes['flow_type'] = intval($attributes['flow_type']); if (!$attributes['id']) { $maxId = Package::withTrashed()->max('id'); diff --git a/app/Models/Virtual/Package.php b/app/Models/Virtual/Package.php index 1ad4b8fd..d0d6f93b 100644 --- a/app/Models/Virtual/Package.php +++ b/app/Models/Virtual/Package.php @@ -72,6 +72,7 @@ class Package extends PackageBase 'name', 'type', 'carrier_operator', + 'flow_type', 'package_type', 'cost_price', 'guide_price', diff --git a/frontend/public/config.js b/frontend/public/config.js index 0434dccc..ecf37712 100644 --- a/frontend/public/config.js +++ b/frontend/public/config.js @@ -3,7 +3,8 @@ var CONFIG = { login_background: '/assets/login_background.jpg', logo_big: '/assets/logo_big.png', logo_small: '/assets/logo_small.png', - url: (window.location.hostname === 'localhost') ? 'http://127.0.0.1:8000/' : '/' + url: (window.location.hostname === 'localhost') ? 'http://vd.dipp.ink/' : '/' }; - +//http://vd.dipp.ink/ +//http://127.0.0.1:8000/ window.CONFIG = CONFIG; diff --git a/frontend/src/views/stats/company-report/index.vue b/frontend/src/views/stats/company-report/index.vue index 5a1fee53..15b48196 100644 --- a/frontend/src/views/stats/company-report/index.vue +++ b/frontend/src/views/stats/company-report/index.vue @@ -41,6 +41,13 @@ +