|
@@ -43,6 +43,7 @@ class Orders extends Auth{
|
|
public function index(Model $Model,OrdersProduct $OrdersProduct,Product $Product,Custom $Custom){
|
|
public function index(Model $Model,OrdersProduct $OrdersProduct,Product $Product,Custom $Custom){
|
|
// 接受参数
|
|
// 接受参数
|
|
$code = request('order_code','');
|
|
$code = request('order_code','');
|
|
|
|
+ $snowflake_id = request('snowflake_id','');
|
|
$orders_other = request('orders_other',0);
|
|
$orders_other = request('orders_other',0);
|
|
$productCode = request('product_code','');
|
|
$productCode = request('product_code','');
|
|
$phone = request('phone','');
|
|
$phone = request('phone','');
|
|
@@ -62,6 +63,7 @@ class Orders extends Auth{
|
|
$map = [];
|
|
$map = [];
|
|
// 编码ID
|
|
// 编码ID
|
|
if( $id ) $map[] = ['orders.id','=',$id];
|
|
if( $id ) $map[] = ['orders.id','=',$id];
|
|
|
|
+ if( $snowflake_id ) $map[] = ['orders.snowflake_id','=',$snowflake_id];
|
|
// 编码ID
|
|
// 编码ID
|
|
if( $orders_other ) $map[] = $orders_other == 1 ? ['orders_product.product_id','>',0] : ['orders_product.product_id','=',0];
|
|
if( $orders_other ) $map[] = $orders_other == 1 ? ['orders_product.product_id','>',0] : ['orders_product.product_id','=',0];
|
|
if( $uid ) $map[] = ['custom.uid','=',$uid];
|
|
if( $uid ) $map[] = ['custom.uid','=',$uid];
|