Commit fea9be4c by 朱继来

调整文本

parent c68944ef
...@@ -170,7 +170,7 @@ function getGoodsName($goods_id) ...@@ -170,7 +170,7 @@ function getGoodsName($goods_id)
} }
// 获取订单来源 // 获取订单来源
function getOrderSource($order_id, $order_type=1) function getOrderSource($order_id, $order_type=1, $order_goods_type=1)
{ {
if ($order_type == 1) { if ($order_type == 1) {
$order = DB::connection('order')->table('lie_order_extend')->where('order_id', $order_id)->select('order_type')->first(); $order = DB::connection('order')->table('lie_order_extend')->where('order_id', $order_id)->select('order_type')->first();
...@@ -202,7 +202,7 @@ function getOrderSource($order_id, $order_type=1) ...@@ -202,7 +202,7 @@ function getOrderSource($order_id, $order_type=1)
} else if ($order_type == 3) { } else if ($order_type == 3) {
return '京东'; return '京东';
} else if ($order_type == 4) { } else if ($order_type == 4) {
return '象牙宝'; return $order_goods_type == 1 ? '开放平台' : '象牙宝';
} }
return false; return false;
......
...@@ -365,7 +365,7 @@ class OrderModel extends Model ...@@ -365,7 +365,7 @@ class OrderModel extends Model
$tmp[$i]['create_time_date'] = date('Y-m-d', $order[$i]['create_time']); $tmp[$i]['create_time_date'] = date('Y-m-d', $order[$i]['create_time']);
$tmp[$i]['create_time_sec'] = date('H:i:s', $order[$i]['create_time']); $tmp[$i]['create_time_sec'] = date('H:i:s', $order[$i]['create_time']);
$tmp[$i]['com_name'] = !empty($order[$i]['tax_title']) ? $order[$i]['tax_title'] : $current_com_name; $tmp[$i]['com_name'] = !empty($order[$i]['tax_title']) ? $order[$i]['tax_title'] : $current_com_name;
$tmp[$i]['items_source'] = $this->getOrderSource($order[$i]['order_id'], $order[$i]['order_type'], $order[$i]['extend_order_type'], $order[$i]['order_source']); $tmp[$i]['items_source'] = $this->getOrderSource($order[$i]['order_id'], $order[$i]['order_type'], $order[$i]['order_goods_type'], $order[$i]['extend_order_type'], $order[$i]['order_source']);
$tmp[$i]['goods_id'] = $order[$i]['goods_id']; $tmp[$i]['goods_id'] = $order[$i]['goods_id'];
...@@ -539,7 +539,7 @@ class OrderModel extends Model ...@@ -539,7 +539,7 @@ class OrderModel extends Model
} }
// 获取订单来源 // 获取订单来源
public function getOrderSource($order_id, $order_type=1, $extend_order_type=0, $order_source='') public function getOrderSource($order_id, $order_type=1, $order_goods_type=1, $extend_order_type=0, $order_source='')
{ {
if ($order_type == 1) { if ($order_type == 1) {
if ($extend_order_type) return '后台'; if ($extend_order_type) return '后台';
...@@ -560,7 +560,7 @@ class OrderModel extends Model ...@@ -560,7 +560,7 @@ class OrderModel extends Model
} else if ($order_type == 3) { } else if ($order_type == 3) {
return '京东'; return '京东';
} else if ($order_type == 4) { } else if ($order_type == 4) {
return '象牙宝'; return $order_goods_type == 1 ? '开放平台' : '象牙宝';
} }
return false; return false;
......
...@@ -298,7 +298,7 @@ ...@@ -298,7 +298,7 @@
<td class="show-list"><?php print_r(App\Http\Controllers\getSalesName($v['sale_id'])); ?></td> <td class="show-list"><?php print_r(App\Http\Controllers\getSalesName($v['sale_id'])); ?></td>
<td class="show-list"><?php echo App\Http\Controllers\getOrderSource($v['order_id'], $v['order_type']); ?></td> <td class="show-list"><?php echo App\Http\Controllers\getOrderSource($v['order_id'], $v['order_type'], 2); ?></td>
<td class="show-list" class="show-list"> <td class="show-list" class="show-list">
<?php <?php
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment