Skip to content

朱继来 / 后台订单管理

Go to a project
Commit cee2deab by 朱继来
Options

Merge branch 'zjl_merge_20190716' into development

parents e43aad69 25fb8fd3
Inline Side-by-side
Showing with 3 additions and 1 deletions
app/Model/OrderModel.php
...@@ -146,7 +146,6 @@ class OrderModel extends Model ...@@ -146,7 +146,6 @@ class OrderModel extends Model
case '1': case '1':
case '2': case '2':
case '6': case '6':
case '7':
$string .= "FIND_IN_SET('pf=".$v."', o.order_source) OR "; $string .= "FIND_IN_SET('pf=".$v."', o.order_source) OR ";
break; break;
case '3': case '3':
...@@ -158,6 +157,9 @@ class OrderModel extends Model ...@@ -158,6 +157,9 @@ class OrderModel extends Model
case '5': case '5':
$string .= "o.order_type = 2 OR "; $string .= "o.order_type = 2 OR ";
break; break;
case '7':
$string .= "o.order_type = 4 OR ";
break;
} }
} }
......
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