Commit 53cd07ba by 朱继来

Merge branch 'zjl_adjust_20181026' into development

parents 9efa3ace d405e044
Showing with 1 additions and 1 deletions
...@@ -79,7 +79,7 @@ class OrderModel extends Model ...@@ -79,7 +79,7 @@ class OrderModel extends Model
if ($map['order_type'] == 1) { // 订单编号 if ($map['order_type'] == 1) { // 订单编号
$query->where('o.order_sn', '=', $map['order_contain']); $query->where('o.order_sn', '=', $map['order_contain']);
} else if ($map['order_type'] == 2) { // 型号名称 } else if ($map['order_type'] == 2) { // 型号名称
$query->whereIn('it.goods_name', '=', $map['order_contain']); $query->where('it.goods_name', '=', $map['order_contain']);
} else { // 会员账号 } 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']);
......
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