hefei hai 1 ano
pai
achega
a020cd29af
Modificáronse 1 ficheiros con 7 adicións e 0 borrados
  1. 7 0
      app/controller/api/store/product/Other.php

+ 7 - 0
app/controller/api/store/product/Other.php

@@ -398,6 +398,7 @@ class Other extends BaseController
398
                     ->field('number,order_sn,status')
398
                     ->field('number,order_sn,status')
399
                     ->where('uid', $userId)
399
                     ->where('uid', $userId)
400
                     ->where('commission_type',5)
400
                     ->where('commission_type',5)
401
+                    ->where('type_shop',1)
401
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
402
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
402
                     ->where('create_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
403
                     ->where('create_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
403
                     ->order('bill_id', 'desc')
404
                     ->order('bill_id', 'desc')
@@ -433,6 +434,7 @@ class Other extends BaseController
433
                     ->field('number,order_sn,status')
434
                     ->field('number,order_sn,status')
434
                     ->where('uid', $userId)
435
                     ->where('uid', $userId)
435
                     ->where('commission_type',5)
436
                     ->where('commission_type',5)
437
+                    ->where('type_shop',2)
436
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
438
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
437
                     ->where('create_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
439
                     ->where('create_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
438
                     ->order('bill_id', 'desc')
440
                     ->order('bill_id', 'desc')
@@ -467,6 +469,7 @@ class Other extends BaseController
467
                     ->field('number,order_sn,status')
469
                     ->field('number,order_sn,status')
468
                     ->where('uid', $userId)
470
                     ->where('uid', $userId)
469
                     ->where('commission_type',5)
471
                     ->where('commission_type',5)
472
+                    ->where('type_shop',3)
470
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
473
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
471
                     ->where('create_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
474
                     ->where('create_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
472
                     ->order('bill_id', 'desc')
475
                     ->order('bill_id', 'desc')
@@ -500,6 +503,7 @@ class Other extends BaseController
500
                     ->field('number,order_sn,status')
503
                     ->field('number,order_sn,status')
501
                     ->where('uid', $userId)
504
                     ->where('uid', $userId)
502
                     ->where('commission_type',5)
505
                     ->where('commission_type',5)
506
+                    ->where('type_shop',5)
503
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
507
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
504
                     ->where('create_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
508
                     ->where('create_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
505
                     ->order('bill_id', 'desc')
509
                     ->order('bill_id', 'desc')
@@ -541,6 +545,7 @@ class Other extends BaseController
541
                     ->field('number,order_sn,status')
545
                     ->field('number,order_sn,status')
542
                     ->where('uid', $userId)
546
                     ->where('uid', $userId)
543
                     ->where('commission_type',5)
547
                     ->where('commission_type',5)
548
+                    ->where('type_shop',6)
544
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
549
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
545
                     ->where('create_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
550
                     ->where('create_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
546
                     ->order('bill_id', 'desc')
551
                     ->order('bill_id', 'desc')
@@ -577,6 +582,7 @@ class Other extends BaseController
577
                     ->field('number,order_sn,status')
582
                     ->field('number,order_sn,status')
578
                     ->where('uid', $userId)
583
                     ->where('uid', $userId)
579
                     ->where('commission_type',5)
584
                     ->where('commission_type',5)
585
+//                    ->where('type_shop',9)
580
                     ->where('pay_success_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
586
                     ->where('pay_success_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
581
                     ->where('pay_success_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
587
                     ->where('pay_success_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
582
                     ->order('bill_id', 'desc')
588
                     ->order('bill_id', 'desc')
@@ -613,6 +619,7 @@ class Other extends BaseController
613
                     ->field('number,order_sn,status')
619
                     ->field('number,order_sn,status')
614
                     ->where('uid', $userId)
620
                     ->where('uid', $userId)
615
                     ->where('commission_type',5)
621
                     ->where('commission_type',5)
622
+                    ->where('type_shop',9)
616
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
623
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
617
                     ->where('create_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
624
                     ->where('create_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
618
                     ->order('bill_id', 'desc')
625
                     ->order('bill_id', 'desc')