rabin 3 gadi atpakaļ
vecāks
revīzija
f709fde108
1 mainītis faili ar 18 papildinājumiem un 7 dzēšanām
  1. 18 7
      service/agent/database/member_shop_log.php

+ 18 - 7
service/agent/database/member_shop_log.php

@@ -164,15 +164,26 @@ return array
             # 匹配的正则或函数 选填项
             'option' => array
             (
-                'mid' => array('yes', 'in'),
-                'start_cdate' => array('yes-cdate','>='),
-                'end_cdate' => array('yes-cdate','<='),
-                'new_shop_id' => 'yes',
-                'state' => 1,
+                'mid' => array('yes-t_1.mid', 'in'),
+                'start_cdate' => array('yes-t_1.cdate','>='),
+                'end_cdate' => array('yes-t_1.cdate','<='),
+                'new_shop_id' => 'yes-t_1.new_shop_id',
+                'agent-member-role' => 'yes-t_2.role',
+                'state' => 'yes-t_1.state-1',
+            ),
+            'join' => array
+            (
+                array
+                (
+                    'table' => 'agent/member',
+                    'type' => 'left join',
+                    'on' => array('mid','id'),
+                    'col' => 't_2.id as mid',
+                ),
             ),
             'type' => 'all',
-            'group' => 'mid,new_shop_id',
-            'order' => array('id' => 'desc'),
+            'group' => 't_1.mid,t_1.new_shop_id',
+            'order' => array('t_1.id' => 'desc'),
             'col' => '*',
         ),