Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/churen

service/agent/database/member.php

@@ -683,5 +683,16 @@ return array
             'type' => 'all',
             'col' => '*|id',
         ),
+        'getShopAll' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'shop_id' => array('yes','>='),
+                'state' => 1,
+            ),
+            'type' => 'all',
+            'col' => '*',
+        ),
     ),
 );

service/agent/database/member_shop_log.php

@@ -0,0 +1,112 @@
+<?php
+$shop = function()
+{
+    $array = array();
+    $data = Dever::db('shop/info-state');
+    if($data)
+    {
+        $array += $data;
+    }
+    return $array;
+};
+return array
+(
+    # 表名
+    'name' => 'member_shop_log',
+    # 显示给用户看的名称
+    'lang' => '归店记录列表',
+    'order' => 9,
+    # 数据结构
+    'struct' => array
+    (
+    
+        'id'        => array
+        (
+            'type'      => 'int-11',
+            'name'      => 'ID',
+            'default'   => '',
+            'desc'      => '',
+            'match'     => 'is_numeric',
+            'search'    => 'order',
+            'update'    => 'hidden',
+            //'list'        => true,
+        ),
+
+        'mid'      => array
+        (
+            'type'      => 'int-11',
+            'name'      => '代理商姓名/手机号',
+            'default'   => '-1',
+            'desc'      => '代理商',
+            'match'     => 'is_string',
+            'update'    => 'text',
+            'search'    => array
+            (
+                'api' => 'agent/member-getSearch',
+                'col' => 'col',
+                'result' => 'id',
+                'search' => 'mid',
+            ),
+            'list_name' => '代理商信息',
+            'list'      => 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
+            'list_order' => 1,
+        ),
+
+        'old_shop_id'      => array
+        (
+            'type'      => 'int-11',
+            'name'      => '变更前店铺名称',
+            'default'   => '',
+            'desc'      => '店铺名称',
+            'match'     => 'is_numeric',
+            'option'    => $shop,
+            'list'      => true,
+            //'list_order' => 6,
+        ),
+
+        'new_shop_id'      => array
+        (
+            'type'      => 'int-11',
+            'name'      => '变更后店铺名称',
+            'default'   => '',
+            'desc'      => '店铺名称',
+            'match'     => 'is_numeric',
+            'option'    => $shop,
+            'list'      => true,
+            //'list_order' => 6,
+        ),
+
+        'state'     => array
+        (
+            'type'      => 'tinyint-1',
+            'name'      => '状态',
+            'default'   => '1',
+            'desc'      => '请选择状态',
+            'match'     => 'is_numeric',
+        ),
+        
+        'cdate'     => array
+        (
+            'type'      => 'int-11',
+            'name'      => '归店时间',
+            'match'     => array('is_numeric', time()),
+            'desc'      => '',
+            # 只有insert时才生效
+            'insert'    => true,
+            'search'    => 'date',
+            'list'      => 'date("Y-m-d", {cdate})',
+            'order'     => 'desc',
+        ),
+    ),
+    'manage' => array
+    (
+        'edit' => false,
+        'insert' => false,
+        'delete' => false,
+    ),
+
+    'request' => array
+    (
+        
+    ),
+);

service/agent/lib/Manage.php

@@ -763,4 +763,18 @@ class Manage
 
         return 'reload';
     }
+
+    public function memberShop_api(){
+        $data = Dever::db('agent/member')->getShopAll(array('shop_id'=>1,'state'=>1));
+        if($data){
+            foreach($data as $k=>$v){
+                $log = Dever::db('agent/member_shop_log')->find(array('mid'=>$v['id']));
+                if($log){ 
+                }else{
+                    Dever::db('agent/member_shop_log')->insert(array('mid'=>$v['id'],'new_shop_id'=>$v['shop_id'],'cdate'=>'1651680000'));
+                }
+            }
+        }
+        return 'ok';
+    }
 }

service/agent/src/My.php

@@ -158,6 +158,14 @@ class My extends Core
         $this->data['info'] = Dever::db('agent/member')->find($id);
         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;
+            $insert['new_shop_id'] = $shop_id;
+            if($this->data['info']['shop_id']){
+                $insert['old_shop_id'] = $this->data['info']['shop_id'];
+            }else{
+                $insert['old_shop_id'] = '';
+            }
+            Dever::db('agent/member_shop_log')->insert($insert);
         } else {
             Dever::alert('这不是您的子账户');
         }