rabin 2 years ago
parent
commit
b801c20df3

+ 26 - 0
service/agent/database/member_shop_log.php

@@ -35,6 +35,11 @@ $excel = array();
 if(Dever::load('manage/auth')->checkFunc('agent.member_shop_log', 'editshoplog', '归店记录明细')){
     $excel[] = array('归店记录明细', '归店记录明细', 'agent/lib/member.out_member_shop_log');
 }
+$status = array
+(
+    1 => '主信息',
+    2 => '历史信息',
+);
 return array
 (
     # 表名
@@ -138,6 +143,15 @@ return array
             //'search'    => $search_auth == 2 ? 'date' : false,
         ),
 
+        'status'      => array
+        (
+            'type'      => 'tinyint-1',
+            'name'      => '状态',
+            'default'   => '2',
+            'desc'      => '请选择状态',
+            'match'     => 'is_numeric',
+        ),
+
         'state'     => array
         (
             'type'      => 'tinyint-1',
@@ -256,5 +270,17 @@ return array
             'order' => array('cdate' => 'asc'),
             'col' => '*',
         ),
+
+        'getData' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'state' => 1,
+            ),
+            'type' => 'all',
+            'order' => array('id' => 'desc'),
+            'col' => '*|mid|',
+        ),
     ),
 );

+ 9 - 0
service/agent/lib/Manage.php

@@ -396,12 +396,21 @@ class Manage
         $shop_id = Dever::param('shop_id', $data);
         if ($shop_id && $member['shop_id'] != $shop_id) {
             $insert['mid'] = $member['id'];
+            $data = Dever::db('agent/member_shop_log')->find($insert);
+            if ($data) {
+                foreach ($data as $k => $v) {
+                    Dever::db('agent/member_shop_log')->update(array('where_id' => $v['id'], 'status' => 2));
+                }
+            }
             $insert['new_shop_id'] = $shop_id;
             $insert['clear'] = true;
             $info = Dever::db('agent/member_shop_log')->find($insert);
             if (!$info) {
                 $insert['old_shop_id'] = $member['shop_id'];
+                $insert['status'] = 1;
                 Dever::db('agent/member_shop_log')->insert($insert);
+            } else {
+                Dever::db('agent/member_shop_log')->update(array('where_id' => $info['id'], 'status' => 1));
             }
         }
 

+ 12 - 0
service/agent/lib/Tool.php

@@ -1120,4 +1120,16 @@ class Tool
         }
         return 'ok';
     }
+
+    # 处理归店记录
+    public function guidian_api()
+    {
+        $data = Dever::db('agent/member_shop_log')->getData();
+        foreach ($data as $k => $v) {
+            if (isset($v[0]) && $v[0]) {
+                Dever::db('agent/member_shop_log')->update(array('where_id' => $v[0]['id'], 'status' => 1));
+            }
+        }
+        return 'ok';
+    }
 }

+ 9 - 0
service/agent/src/My.php

@@ -186,6 +186,12 @@ class My extends Core
         if ($this->data['info'] && $this->data['info']['idcard'] == $this->user['idcard']) {
             Dever::db('agent/member')->update(array('where_id' => $id, 'shop_id' => $shop_id, 'is_shop' => 1));
             $insert['mid'] = $id;
+            $data = Dever::db('agent/member_shop_log')->find($insert);
+            if ($data) {
+                foreach ($data as $k => $v) {
+                    Dever::db('agent/member_shop_log')->update(array('where_id' => $v['id'], 'status' => 2));
+                }
+            }
             $insert['new_shop_id'] = $shop_id;
             $info = Dever::db('agent/member_shop_log')->find($insert);
             if (!$info) {
@@ -194,7 +200,10 @@ class My extends Core
                 }else{
                     $insert['old_shop_id'] = '';
                 }
+                $insert['status'] = 1;
                 Dever::db('agent/member_shop_log')->insert($insert);
+            } else {
+                Dever::db('agent/member_shop_log')->update(array('where_id' => $info['id'], 'status' => 1));
             }
         } else {
             Dever::alert('这不是您的子账户');