hydrz/vd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intval

Browse Source
This commit is contained in:
邓皓元 2019-01-04 09:22:22 +08:00
parent b6404dd242
commit 88f9868f0b
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Domains/Real/Commands/Sync/AddedOrderSync.php
View File

@ -102,7 +102,7 @@ class AddedOrderSync extends Command
foreach ($orders as &$item) { foreach ($orders as &$item) {
$item['company_id'] = $this->companies[$item['company_id']]['id'] ?? 0; $item['company_id'] = $this->companies[$item['company_id']]['id'] ?? 0;
$item['total_price'] = floatval($item['total_price']) * 100; $item['total_price'] = intval($item['total_price']) * 100;
$item['counts'] = !empty($item['counts']) ? $item['counts'] : 1; $item['counts'] = !empty($item['counts']) ? $item['counts'] : 1;
$item['pay_channel'] = CommonService::transformerPayChannel($item['pay_channel']); $item['pay_channel'] = CommonService::transformerPayChannel($item['pay_channel']);
$item['unit_price'] = intval($item['total_price']/$item['counts']); $item['unit_price'] = intval($item['total_price']/$item['counts']);
@ -137,7 +137,7 @@ class AddedOrderSync extends Command
$item['order_id'] = $orders[$item['order_sn']]['id'] ?? 0; $item['order_id'] = $orders[$item['order_sn']]['id'] ?? 0;
$item['company_id'] = $orders[$item['order_sn']]['company_id'] ?? 0; $item['company_id'] = $orders[$item['order_sn']]['company_id'] ?? 0;
$item['package_id'] = $this->packages[$item['package_id']]['id'] ?? 0; $item['package_id'] = $this->packages[$item['package_id']]['id'] ?? 0;
$item['unit_price'] = floatval($item['unit_price']) * 100; $item['unit_price'] = intval($item['unit_price']) * 100;
} }
$this->types = array_pluck($orderItems, 'type', 'order_sn'); $this->types = array_pluck($orderItems, 'type', 'order_sn');

4
app/Domains/Real/Commands/Sync/PackageSync.php
View File

@ -216,8 +216,8 @@ class PackageSync extends Command
$package['id'] = ($package['type'] + 1) * 1000000 + $package['id']; $package['id'] = ($package['type'] + 1) * 1000000 + $package['id'];
$package['parent_id'] = $package['parent_id'] ?? 0; $package['parent_id'] = $package['parent_id'] ?? 0;
$package['carrier_operator'] = self::$carrier_operator[$package['carrier_operator']] ?? 255; $package['carrier_operator'] = self::$carrier_operator[$package['carrier_operator']] ?? 255;
$package['cost_price'] = floatval($package['cost_price']) * 100; $package['cost_price'] = intval($package['cost_price']) * 100;
$package['guide_price'] = floatval($package['guide_price']) * 100; $package['guide_price'] = intval($package['guide_price']) * 100;
$package['flows'] = intval($package['flows']); $package['flows'] = intval($package['flows']);
$package['voices'] = intval($package['voices']); $package['voices'] = intval($package['voices']);
$package['messages'] = intval($package['messages']); $package['messages'] = intval($package['messages']);

4
app/Domains/Virtual/Commands/Sync/LogSync.php
View File

@ -68,8 +68,8 @@ class LogSync extends Command
$value = (array)$value; $value = (array)$value;
$package = $this->getPackage($value['content']); $package = $this->getPackage($value['content']);
$unit_price = floatval($value['sale_account']) * 100; $unit_price = intval($value['sale_account']) * 100;
$custom_price = floatval($value['order_account']) * 100; $custom_price = intval($value['order_account']) * 100;
$product = $this->getProduct($package, $value['company'], $unit_price); $product = $this->getProduct($package, $value['company'], $unit_price);
$type = self::$types[$value['type']]; $type = self::$types[$value['type']];
$pay_channel = self::$payChannels[$value['pay_type']]; $pay_channel = self::$payChannels[$value['pay_type']];

2
app/Domains/Virtual/Commands/Sync/ProductSync.php
View File

@ -33,7 +33,7 @@ class ProductSync extends Command
throw new \Exception('套餐不存在'); throw new \Exception('套餐不存在');
} }
$base_price = floatval($value['sale_account']) * 100; $base_price = intval($value['sale_account']) * 100;
$products[] = [ $products[] = [
'sn' => strtoupper($package['sn'] . '_' . $value['company'] . '_' . $base_price), 'sn' => strtoupper($package['sn'] . '_' . $value['company'] . '_' . $base_price),

8
app/Domains/Virtual/Services/PackageService.php
View File

@ -106,10 +106,10 @@ class PackageService extends Service
Validator::validate($attributes, $rule, $message); Validator::validate($attributes, $rule, $message);
$attributes['cost_price'] = floatval($attributes['cost_price']) * 100; $attributes['cost_price'] = intval($attributes['cost_price']) * 100;
$attributes['guide_price'] = floatval($attributes['guide_price']) * 100; $attributes['guide_price'] = intval($attributes['guide_price']) * 100;
$attributes['renewal_cost_price'] = floatval($attributes['renewal_cost_price']) * 100; $attributes['renewal_cost_price'] = intval($attributes['renewal_cost_price']) * 100;
$attributes['renewal_guide_price'] = floatval($attributes['renewal_guide_price']) * 100; $attributes['renewal_guide_price'] = intval($attributes['renewal_guide_price']) * 100;
if (!$attributes['id']) { if (!$attributes['id']) {
$maxId = Package::withTrashed()->where('type', $attributes['type'])->max('id'); $maxId = Package::withTrashed()->where('type', $attributes['type'])->max('id');

4
app/Domains/Virtual/Services/ProductService.php
View File

@ -57,8 +57,8 @@ class ProductService extends Service
*/ */
public function store(array $attributes = []) public function store(array $attributes = [])
{ {
$attributes['base_price'] = floatval($attributes['base_price']) * 100; $attributes['base_price'] = intval($attributes['base_price']) * 100;
$attributes['renewal_price'] = floatval($attributes['renewal_price']) * 100; $attributes['renewal_price'] = intval($attributes['renewal_price']) * 100;
$rule = [ $rule = [
'name' => ['required', 'between:2,32'], 'name' => ['required', 'between:2,32'],

4
frontend/src/views/virtual/packages/edit.vue
View File

@ -53,14 +53,14 @@
</div> </div>
</li> </li>
<li class="ui-list" v-if="!type"> <li class="ui-list" v-if="type">
<div class="ui-list-title">生效延迟</div> <div class="ui-list-title">生效延迟</div>
<div class="ui-list-content"> <div class="ui-list-content">
<InputNumber :formatter="value => Number(value).toFixed(0)" :max="100000" :min="0" :step="1" v-model="params.effect_months"></InputNumber>&nbsp;月 <InputNumber :formatter="value => Number(value).toFixed(0)" :max="100000" :min="0" :step="1" v-model="params.effect_months"></InputNumber>&nbsp;月
</div> </div>
</li> </li>
<li class="ui-list" v-if="!type"> <li class="ui-list" v-if="type">
<div class="ui-list-title">服务延长</div> <div class="ui-list-title">服务延长</div>
<div class="ui-list-content"> <div class="ui-list-content">
<InputNumber :formatter="value => Number(value).toFixed(0)" :max="100000" :min="0" :step="1" v-model="params.delay_months"></InputNumber>&nbsp;月 <InputNumber :formatter="value => Number(value).toFixed(0)" :max="100000" :min="0" :step="1" v-model="params.delay_months"></InputNumber>&nbsp;月