hefei 1 год назад
Родитель
Сommit
a020cd29af
1 измененных файлов с 7 добавлено и 0 удалено
  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 398
                     ->field('number,order_sn,status')
399 399
                     ->where('uid', $userId)
400 400
                     ->where('commission_type',5)
401
+                    ->where('type_shop',1)
401 402
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
402 403
                     ->where('create_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
403 404
                     ->order('bill_id', 'desc')
@@ -433,6 +434,7 @@ class Other extends BaseController
433 434
                     ->field('number,order_sn,status')
434 435
                     ->where('uid', $userId)
435 436
                     ->where('commission_type',5)
437
+                    ->where('type_shop',2)
436 438
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
437 439
                     ->where('create_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
438 440
                     ->order('bill_id', 'desc')
@@ -467,6 +469,7 @@ class Other extends BaseController
467 469
                     ->field('number,order_sn,status')
468 470
                     ->where('uid', $userId)
469 471
                     ->where('commission_type',5)
472
+                    ->where('type_shop',3)
470 473
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
471 474
                     ->where('create_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
472 475
                     ->order('bill_id', 'desc')
@@ -500,6 +503,7 @@ class Other extends BaseController
500 503
                     ->field('number,order_sn,status')
501 504
                     ->where('uid', $userId)
502 505
                     ->where('commission_type',5)
506
+                    ->where('type_shop',5)
503 507
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
504 508
                     ->where('create_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
505 509
                     ->order('bill_id', 'desc')
@@ -541,6 +545,7 @@ class Other extends BaseController
541 545
                     ->field('number,order_sn,status')
542 546
                     ->where('uid', $userId)
543 547
                     ->where('commission_type',5)
548
+                    ->where('type_shop',6)
544 549
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
545 550
                     ->where('create_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
546 551
                     ->order('bill_id', 'desc')
@@ -577,6 +582,7 @@ class Other extends BaseController
577 582
                     ->field('number,order_sn,status')
578 583
                     ->where('uid', $userId)
579 584
                     ->where('commission_type',5)
585
+//                    ->where('type_shop',9)
580 586
                     ->where('pay_success_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
581 587
                     ->where('pay_success_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
582 588
                     ->order('bill_id', 'desc')
@@ -613,6 +619,7 @@ class Other extends BaseController
613 619
                     ->field('number,order_sn,status')
614 620
                     ->where('uid', $userId)
615 621
                     ->where('commission_type',5)
622
+                    ->where('type_shop',9)
616 623
                     ->where('create_time', '>', date('Y-m-d H:i:s', strtotime($startTime)))
617 624
                     ->where('create_time', '<', date('Y-m-d H:i:s', strtotime($endTime)))
618 625
                     ->order('bill_id', 'desc')