edit

app/shop/database/info.php

@@ -767,6 +767,20 @@ return array
             'col' => 'id,id as value, name',
         ),
 
+        'getAllByType' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'town' => 'yes',
+                'area' => array('yes', 'like'),
+                'state' => 1,
+            ),
+            'type' => 'all',
+            'order' => array('type' => 'desc', 'reorder' => 'desc', 'id' => 'desc'),
+            'col' => 'id,id as value, name',
+        ),
+
         'getInfo' => array
         (
             # 匹配的正则或函数 选填项

service/agent/lib/Import.php

@@ -121,9 +121,18 @@ class Import
                 $data['pay_status'] = 2;
 
                 $data['order_num'] = Dever::load('agent/lib/order')->getOrderId();
+                $data['cdate'] = $v['createtime'];
+                if ($data['status'] == 4) {
+                    $data['fdate'] = 1;
+                }
                 $order_id = Dever::db('agent/order')->insert($data);
 
-                if ($order_id && $data['status'] == 4) {
+                if ($order_id) {
+
+                    if ($data['status'] == 2) {
+
+                    }
+
                     $member = Dever::db('agent/member')->find($v['id']);
 
                     if ($data['status'] == 4) {
@@ -138,10 +147,10 @@ class Import
                     $data['cash'] = $v['credit2'];
                     $data['group_sell'] = $v['allcommission'];
                     if (!$member) {
-                        Dever::db('agent/order')->insert($data);
+                        Dever::db('agent/member')->insert($data);
                     } else {
                         $data['where_id'] = $member['id'];
-                        Dever::db('agent/order')->update($data);
+                        Dever::db('agent/member')->update($data);
                     }
                 }
             }

service/agent/src/My.php

@@ -120,9 +120,9 @@ class My extends Core
     {
         $where['type'] = 10;
         $where['area'] = Dever::input('area');
-        $this->data['shop'] = Dever::db('shop/info')->getAll($where);
+        $this->data['shop'] = Dever::db('shop/info')->getAllByType($where);
 
-        $this->data['pshop'] = Dever::db('shop/info')->getInfo(array('type' => 10));
+        //$this->data['pshop'] = Dever::db('shop/info')->getInfo(array('type' => 10));
 
         $id = Dever::input('id', $this->uid);
         $this->data['info'] = Dever::db('agent/member')->find($id);