Commit 96aedbf5 by 朱继来

Merge branch 'master' into development

parents f1439545 887861fa
Showing with 7 additions and 7 deletions
...@@ -74,18 +74,18 @@ class OrderModel extends Model ...@@ -74,18 +74,18 @@ class OrderModel extends Model
->where(function ($query) use ($map) { ->where(function ($query) use ($map) {
// 查询类型 // 查询类型
if (!empty($map['order_contain'])) { if (!empty($map['order_contain'])) {
if ($map['order_type'] == 1) { // 订单编号 if ($map['order_type'] == 1) { // 会员账号
$query->where('o.order_sn', '=', $map['order_contain']);
} else if ($map['order_type'] == 2) { // 型号名称
$query->where('it.goods_name', '=', $map['order_contain']);
} else if ($map['order_type'] == 3) { // 发票抬头
$query->where('i.tax_title', '=', $map['order_contain']);
} else { // 会员账号
if (preg_match('/@/', $map['order_contain'])) { if (preg_match('/@/', $map['order_contain'])) {
$query->where('u.email', '=', $map['order_contain']); $query->where('u.email', '=', $map['order_contain']);
} else { } else {
$query->where('u.mobile', '=', $map['order_contain']); $query->where('u.mobile', '=', $map['order_contain']);
} }
} else if ($map['order_type'] == 2) { // 型号名称
$query->where('it.goods_name', '=', $map['order_contain']);
} else if ($map['order_type'] == 3) { // 发票抬头
$query->where('i.tax_title', '=', $map['order_contain']);
} else { // 订单编号
$query->where('o.order_sn', '=', $map['order_contain']);
} }
} }
}) })
......
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