diff --git a/app/Domains/Export/Http/Controllers/ExportController.php b/app/Domains/Export/Http/Controllers/ExportController.php index 1397948b..86f87ab8 100644 --- a/app/Domains/Export/Http/Controllers/ExportController.php +++ b/app/Domains/Export/Http/Controllers/ExportController.php @@ -3,8 +3,6 @@ namespace App\Domains\Export\Http\Controllers; use App\Core\Controller; use Illuminate\Http\Request; -use Illuminate\Support\Carbon; -use Illuminate\Support\Facades\Storage; use App\Domains\Export\Services\ExportService; class ExportController extends Controller diff --git a/app/Domains/Real/Commands/Sync/AddedOrderSync.php b/app/Domains/Real/Commands/Sync/AddedOrderSync.php index f050a1ee..97fe06cf 100644 --- a/app/Domains/Real/Commands/Sync/AddedOrderSync.php +++ b/app/Domains/Real/Commands/Sync/AddedOrderSync.php @@ -146,6 +146,7 @@ class AddedOrderSync extends Command ->whereIn('account_no', array_keys($this->business_type)) ->where('create_time', '>=', $starttime->timestamp) ->where('create_time', '<=', $endtime->timestamp) + ->where('r_id', 112370) ->orderBy('create_time')->get()->collect()->toArray(); $array = []; diff --git a/app/Domains/Stats/Exports/OrderDetailExport.php b/app/Domains/Stats/Exports/OrderDetailExport.php index 60745b82..27597226 100644 --- a/app/Domains/Stats/Exports/OrderDetailExport.php +++ b/app/Domains/Stats/Exports/OrderDetailExport.php @@ -11,6 +11,7 @@ use Illuminate\Database\Eloquent\Builder; use App\Domains\Stats\Services\OrderService; use Dipper\Excel\Concerns\WithColumnFormatting; use PhpOffice\PhpSpreadsheet\Style\NumberFormat; +use App\Domains\Virtual\Repositories\OrderCardPartitionRepository; class OrderDetailExport extends AbstractExport implements FromQuery, WithHeadings, WithRows, WithColumnFormatting { @@ -29,13 +30,11 @@ class OrderDetailExport extends AbstractExport implements FromQuery, WithHeading */ public function query() { - if (!$class = OrderService::$classes[$this->conditions['type']]) { + if (!isset(self::$types[$this->conditions['type']])) { throw new NotAllowedException('统计类型不存在'); } - $repository = app($class); - - $builder = $repository->forceNoReset()->withConditions($this->conditions)->applyConditions(); + $builder = app(OrderCardPartitionRepository::class)->forceNoReset()->withConditions($this->conditions)->applyConditions()->orderBy('sim'); return $builder; } @@ -102,7 +101,7 @@ class OrderDetailExport extends AbstractExport implements FromQuery, WithHeading */ protected function tag() { - if ((!$tag = self::$classes[get_class($this)]) || !self::$types[$this->conditions['type']]) { + if (!isset(self::$types[$this->conditions['type']])) { throw new NotAllowedException('类型不允许'); } diff --git a/app/Domains/Stats/Http/Controllers/OrderController.php b/app/Domains/Stats/Http/Controllers/OrderController.php index 08445bc1..36fee12a 100644 --- a/app/Domains/Stats/Http/Controllers/OrderController.php +++ b/app/Domains/Stats/Http/Controllers/OrderController.php @@ -2,11 +2,11 @@ namespace App\Domains\Stats\Http\Controllers; use Illuminate\Http\Request; -use App\Exceptions\NotAllowedException; use App\Domains\Stats\Exports\OrderExport; use App\Domains\Stats\Services\OrderService; use App\Domains\Export\Services\ExportService; use App\Domains\Stats\Exports\OrderDetailExport; +use App\Domains\Virtual\Repositories\OrderCardPartitionRepository; class OrderController extends Controller { @@ -83,13 +83,7 @@ class OrderController extends Controller $conditions = $this->request->except(['page', 'limit']); $conditions['order_id'] = $this->request->ids('order_id'); - if (!$class = OrderService::$classes[$conditions['type']]) { - throw new NotAllowedException('统计类型不存在'); - } - - $repository = app($class); - - $total = $repository->withConditions($conditions)->applyConditions()->count(); + $total = app(OrderCardPartitionRepository::class)->withConditions($conditions)->applyConditions()->count(); try { $export = new OrderDetailExport($conditions); diff --git a/app/Domains/Virtual/Exports/CardExport.php b/app/Domains/Virtual/Exports/CardExport.php index fddfc3ba..f3d51d60 100644 --- a/app/Domains/Virtual/Exports/CardExport.php +++ b/app/Domains/Virtual/Exports/CardExport.php @@ -26,7 +26,7 @@ class CardExport extends AbstractExport implements FromQuery, WithHeadings, With public function query() { $this->conditions['type'] = 0; - $builder = app(OrderCardPartitionRepository::class)->forceNoReset()->withConditions($this->conditions)->applyConditions(); + $builder = app(OrderCardPartitionRepository::class)->forceNoReset()->withConditions($this->conditions)->orderBy('sim')->applyConditions(); return $builder; } diff --git a/app/Domains/Virtual/Exports/FlowPoolExportDetailExport.php b/app/Domains/Virtual/Exports/FlowPoolExportDetailExport.php index 4070d079..fcafc919 100644 --- a/app/Domains/Virtual/Exports/FlowPoolExportDetailExport.php +++ b/app/Domains/Virtual/Exports/FlowPoolExportDetailExport.php @@ -35,7 +35,7 @@ class FlowPoolExportDetailExport extends AbstractExport implements FromQuery, Wi $table = app(FlowPoolMonth::class)->getTable() . '_' . $month->format('Ym'); - return app(FlowPoolMonth::class)->setTable($table)->where('pool_id', $pool_id)->select(['package_id', 'sim', 'mebibyte']); + return app(FlowPoolMonth::class)->setTable($table)->where('pool_id', $pool_id)->select(['package_id', 'sim', 'mebibyte'])->orderBy('sim'); } public function headings(): array diff --git a/app/Domains/Virtual/Exports/OrderCardExport.php b/app/Domains/Virtual/Exports/OrderCardExport.php index 93c11b34..4b9fe616 100644 --- a/app/Domains/Virtual/Exports/OrderCardExport.php +++ b/app/Domains/Virtual/Exports/OrderCardExport.php @@ -28,7 +28,7 @@ class OrderCardExport extends AbstractExport implements FromQuery, WithHeadings, public function query() { $builder = app(OrderCardPartitionRepository::class)->with('order')->forceNoReset()->select(['sim', 'order_id', 'counts', 'refunded_at']) - ->withConditions($this->conditions)->orderBy('order_id'); + ->withConditions($this->conditions)->orderBy('order_id')->orderBy('sim'); return $builder; } diff --git a/app/Domains/Virtual/Exports/OrderExport.php b/app/Domains/Virtual/Exports/OrderExport.php index 986f2d39..21fe76ad 100644 --- a/app/Domains/Virtual/Exports/OrderExport.php +++ b/app/Domains/Virtual/Exports/OrderExport.php @@ -33,7 +33,8 @@ class OrderExport extends AbstractExport implements FromQuery, WithHeadings, Wit public function query() { - $builder = app(OrderRepository::class)->forceNoReset()->withConditions($this->conditions)->applyConditions()->orderBy('order_at', 'desc'); + $builder = app(OrderRepository::class)->forceNoReset()->withConditions($this->conditions)->applyConditions() + ->orderBy('order_at', 'desc'); return $builder; } @@ -100,7 +101,7 @@ class OrderExport extends AbstractExport implements FromQuery, WithHeadings, Wit CommonService::namePayChannel($item['pay_channel']), "{$item['transaction_no']}\t", $item['counts'], - sprintf('%.02f', $item['custom_price']/100), + sprintf('%.02f', $item['unit_price']*$item['counts']/100), Carbon::parse($item['order_at'])->format('Y-m-d'), ]; diff --git a/database/migrations/migrate_from_old.pgsql b/database/migrations/migrate_from_old.pgsql index 092b82b5..8997ab94 100644 --- a/database/migrations/migrate_from_old.pgsql +++ b/database/migrations/migrate_from_old.pgsql @@ -103,12 +103,13 @@ INSERT INTO vd.cards (sim, imsi, iccid, carrier_operator, "type", virtual_activa iccid, CASE carrieroperator WHEN 10 THEN 0 WHEN 11 THEN 1 WHEN 12 THEN 2 ELSE 255 END AS carrier_operator, CASE WHEN substr(card_number, 4, 1)::INT >= 5 THEN 1 ELSE 0 END AS "type", - CASE card_cycle_start::int WHEN 0 THEN NULL ELSE to_timestamp(card_cycle_start::int) END AS virtual_activated_at, - CASE custom_state WHEN 13 THEN to_timestamp(update_time) ELSE NULL END AS cancelled_at, - to_timestamp(create_time) as created_at, - to_timestamp(update_time) as updated_at + CASE valid_start_time WHEN '0' THEN NULL WHEN '' THEN NULL ELSE to_timestamp(valid_start_time::int) END AS virtual_activated_at, + CASE custom_state WHEN 13 THEN to_timestamp(ckb_custom.update_time) ELSE NULL END AS cancelled_at, + to_timestamp(ckb_custom.create_time) as created_at, + to_timestamp(ckb_custom.update_time) as updated_at FROM ckb_custom + LEFT JOIN vd.ckb_custom_handle_log ON ckb_custom.custom_no = ckb_custom_handle_log.custom_no AND ckb_custom_handle_log.type = 10 ) ON CONFLICT (sim) DO UPDATE SET virtual_activated_at=excluded.virtual_activated_at, cancelled_at=excluded.cancelled_at; @@ -186,7 +187,7 @@ INSERT INTO vd.virtual_order_renewal_package_cards ("type", sim, order_id, compa SELECT vd_old_orders.order_type AS "type", vd_old_orders.sim::BIGINT AS sim, - virtual_orders.ID AS order_id, + virtual_orders.id AS order_id, vd_old_orders.company_id, vd_old_orders.package_id, vd_old_orders.counts, @@ -207,7 +208,7 @@ INSERT INTO vd.virtual_order_flows_package_cards ("type", sim, order_id, company SELECT vd_old_orders.order_type AS "type", vd_old_orders.sim::BIGINT AS sim, - virtual_orders.ID AS order_id, + virtual_orders.id AS order_id, vd_old_orders.company_id, vd_old_orders.package_id, vd_old_orders.counts, @@ -222,4 +223,3 @@ INSERT INTO vd.virtual_order_flows_package_cards ("type", sim, order_id, company WHERE vd_old_orders.order_type = 3 ) ON CONFLICT (sim, order_id, COALESCE(deleted_at::TIMESTAMP, '1970-01-01 08:00:00'::TIMESTAMP)) DO UPDATE SET counts = excluded.counts, service_start_at = excluded.service_start_at, service_end_at = excluded.service_end_at; - diff --git a/frontend/src/views/virtual/cards/js/index.js b/frontend/src/views/virtual/cards/js/index.js index e2c0f0fe..1642b0d8 100644 --- a/frontend/src/views/virtual/cards/js/index.js +++ b/frontend/src/views/virtual/cards/js/index.js @@ -43,12 +43,12 @@ export default { { title: '企业名称', key: 'company_name', - width: 300 + minWidth: 300 }, { title: '套餐名称', key: 'package_name', - width: 110 + minWidth: 110 }, { title: '状态', @@ -75,6 +75,7 @@ export default { { title: '操作', key: 'action', + width: 110, render: (h, { row, column, diff --git a/frontend/src/views/virtual/orders/cards.vue b/frontend/src/views/virtual/orders/cards.vue index 6912ea81..8691090f 100644 --- a/frontend/src/views/virtual/orders/cards.vue +++ b/frontend/src/views/virtual/orders/cards.vue @@ -6,7 +6,7 @@ @on-visible-change="visibleChange" v-model="my_show" width="1440" - :z-index="source === 0 ? 1000 : 500" + :z-index="source === 0 ? 400 : 300" >
diff --git a/frontend/src/views/virtual/orders/edit.vue b/frontend/src/views/virtual/orders/edit.vue index 4b6b71ed..f3932a0e 100644 --- a/frontend/src/views/virtual/orders/edit.vue +++ b/frontend/src/views/virtual/orders/edit.vue @@ -6,7 +6,7 @@ @on-visible-change="visibleChange" v-model="my_show" width="500" - :mask-style="{ 'z-index': source === 1 ? 2000 : 1500}" + :mask-style="{ 'z-index': source === 1 ? 1000 : 500}" >