edit

app/shop/database/info.php

@@ -147,7 +147,7 @@ return array
         
         'name'      => array
         (
-            'type'      => 'varchar-32',
+            'type'      => 'varchar-300',
             'name'      => '门店名称',
             'default'   => '',
             'desc'      => '请输入门店名称',
@@ -695,8 +695,6 @@ return array
         (
             'delete' => '删除',
             'br3' => array('<br /><br />'),
-            'add' => $add,
-            'br11' => array('<br /><br />'),
 
             'location1' => array('分配工厂', Dever::url('lib/set.factory', 'shop')),
 
@@ -721,7 +719,8 @@ return array
             'list1' => array('账号管理', '"member&search_option_shop_id={id}&oper_table=info"'),
             'list2' => array('打印机管理', '"print&search_option_shop_id={id}&oper_table=info"'),
 
-            //'br3' => array('<br /><br />'),
+            'br31' => array('<br /><br />'),
+            'add' => $add,
 
             //'list3' => array('销售订单', '"sell_order&search_option_shop_id={id}&oper_table=info"'),
             //'list4' => array('采购订单', '"buy_order&search_option_shop_id={id}&oper_table=info"'),

app/shop/database/sign.php

@@ -6,9 +6,9 @@ $acct_type = array
 );
 $mer_type = array
 (
-    1 => '企业商户',
     2 => '个人工商户',
-    3 => '小微商户',
+    1 => '企业商户',
+    //3 => '小微商户',
 );
 $id = Dever::input('search_option_shop_id');
 $shop = array();
@@ -24,6 +24,7 @@ return array
     'lang' => '自主签约',
     # 后台菜单排序
     'order' => 99,
+    'desc' => '当前签约状态：',
     # 数据结构
     'struct' => array
     (
@@ -39,6 +40,16 @@ return array
             'order'     => 'desc',
         ),
 
+        'ums_reg_id'      => array
+        (
+            'type'      => 'varchar-50',
+            'name'      => '自助签约平台唯一标识',
+            'default'   => '',
+            'desc'      => '自助签约平台唯一标识',
+            'match'     => 'option',
+            // 'update'    => 'text',
+        ),
+
         'shop_id'       => array
         (
             'type'      => 'int-11',
@@ -52,17 +63,69 @@ return array
             //'list'      => '{uid} > 0 ? Dever::load("passport/user-find#username", {uid}) : "匿名用户"',
         ),
 
-        // 'request_seq'      => array
-        // (
-        //     'type'      => 'varchar-100',
-        //     'name'      => '请求流水号',
-        //     'default'   => '',
-        //     'desc'      => '请求流水号',
-        //     'match'     => 'is_string',
-        //     // 'update'    => 'text',
-        //     'search'    => 'fulltext',
-        //     // 'list'      => true,
-        // ),
+        'shop_name'      => array
+        (
+            'type'      => 'varchar-300',
+            'name'      => '门店名称',
+            'default'   => '',
+            'desc'      => '请输入门店名称',
+            'match'     => 'is_string',
+            'update'    => 'text',
+            'search'    => 'fulltext',
+            'list'      => true,
+            'value'     => $shop ? $shop['name'] : false,
+            'tab'       => 0,
+        ),
+
+        'mccCode'      => array
+        (
+            'type'      => 'varchar-200',
+            'name'      => '行业类别编码',
+            'default'   => '5499',
+            'desc'      => '行业类别编码',
+            'match'     => 'option',
+            'update'    => 'text',
+            'tab'       => 0,
+        ),
+
+        'tax'     => array
+        (
+            'type'      => 'varchar-150',
+            'name'      => '税务登记证',
+            'default'   => '',
+            'desc'      => '税务登记证',
+            'match'     => 'option',
+            'update'    => 'image',
+            'key'       => '8',
+            'place'     => '660*660',
+            'tab'       => 0,
+        ),
+
+        'door'     => array
+        (
+            'type'      => 'varchar-150',
+            'name'      => '门头照片',
+            'default'   => '',
+            'desc'      => '门头照片',
+            'match'     => 'option',
+            'update'    => 'image',
+            'key'       => '8',
+            'place'     => '660*660',
+            'tab'       => 0,
+        ),
+
+        'house_pic'     => array
+        (
+            'type'      => 'varchar-150',
+            'name'      => '室内照片',
+            'default'   => '',
+            'desc'      => '室内照片',
+            'match'     => 'option',
+            'update'    => 'image',
+            'key'       => '8',
+            'place'     => '660*660',
+            'tab'       => 0,
+        ),
 
         'name'      => array
         (
@@ -74,6 +137,7 @@ return array
             'update'    => 'text',
             'search'    => 'fulltext',
             'list'      => true,
+            'tab'       => 1,
         ),
 
         'mobile'      => array
@@ -86,35 +150,37 @@ return array
             'update'    => 'text',
             'search'    => 'fulltext',
             'list'      => true,
+            'tab'       => 1,
+        ),
+
+        'legalmanHomeAddr'      => array
+        (
+            'type'      => 'varchar-50',
+            'name'      => '法人家庭地址',
+            'default'   => '',
+            'desc'      => '法人家庭地址',
+            'match'     => 'option',
+            'update'    => 'text',
+            'tab'       => 1,
         ),
 
         'idcard'      => array
         (
             'type'      => 'varchar-32',
-            'name'      => '身份证号码',
+            'name'      => '法人身份证号码',
             'default'   => '',
             'desc'      => '身份证号码',
             'match'     => Dever::rule('idcard'),
             'update'    => 'text',
-        ),
-
-        'reg_mer_type'      => array
-        (
-            'type'      => 'int-11',
-            'name'      => '注册类型',
-            'default'   => '2',
-            'desc'      => '注册类型',
-            'match'     => 'option',
-            'update'    => 'select',
-            'option'    => $mer_type,
+            'tab'       => 1,
         ),
 
         'card_deadline'      => array
         (
             'type'      => 'varchar-32',
-            'name'      => '法人证件截止日期',
+            'name'      => '法人身份证截止日期',
             'default'   => '',
-            'desc'      => '法人证件截止日期',
+            'desc'      => '身份证截止日期',
             'match'     => 'option',
             'default'   => '0',
             'desc'      => '',
@@ -122,137 +188,78 @@ return array
             'update'    => 'day',
             'search'    => 'date',
             'callback'  => 'maketime',
+            'tab'       => 1,
         ),
 
-        'back_no'      => array
+        'idcard_front'     => array
         (
-            'type'      => 'varchar-50',
-            'name'      => '开户行行号',
+            'type'      => 'varchar-150',
+            'name'      => '法人身份证正面',
             'default'   => '',
-            'desc'      => '开户行行号',
+            'desc'      => '身份证正面',
             'match'     => 'option',
-            // 'update'    => 'text',
+            'update'    => 'image',
+            'key'       => '8',
+            'place'     => '660*660',
+            'value'     => $shop ? $shop['idcard_front'] : false,
+            'tab'       => 1,
         ),
 
-        'shop_addr_ext'      => array
+        'idcard_back'     => array
         (
-            'type'      => 'varchar-50',
-            'name'      => '开户行地址',
+            'type'      => 'varchar-150',
+            'name'      => '法人身份证背面',
             'default'   => '',
-            'desc'      => '开户行地址',
+            'desc'      => '法人身份证背面',
             'match'     => 'option',
-            // 'update'    => 'text',
+            'update'    => 'image',
+            'key'       => '8',
+            'place'     => '660*660',
+            'value'     => $shop ? $shop['idcard_back'] : false,
+            'tab'       => 1,
         ),
 
-        'ums_reg_id'      => array
+        'hand_idcard'     => array
         (
-            'type'      => 'varchar-50',
-            'name'      => '自助签约平台唯一标识',
+            'type'      => 'varchar-150',
+            'name'      => '法人手持身份证自拍照',
             'default'   => '',
-            'desc'      => '自助签约平台唯一标识',
+            'desc'      => '法人手持身份证自拍照',
             'match'     => 'option',
-            // 'update'    => 'text',
+            'update'    => 'image',
+            'key'       => '8',
+            'place'     => '660*660',
+            'tab'       => 1,
         ),
 
-        'bank_acct_type'      => array
+        'reg_mer_type'      => array
         (
             'type'      => 'int-11',
-            'name'      => '账户类型',
-            'default'   => '-1',
-            'desc'      => '账户类型',
-            'match'     => 'option',
-            'update'    => 'select',
-            'option'    => $acct_type,
-        ),
-
-        'bank_acct_no'      => array
-        (
-            'type'      => 'varchar-50',
-            'name'      => '开户行账号',
-            'default'   => '',
-            'desc'      => '开户行账号',
-            'match'     => 'option',
-            'update'    => 'text',
-        ),
-
-        'bank_acct_name'      => array
-        (
-            'type'      => 'varchar-50',
-            'name'      => '开户账号名称',
-            'default'   => '',
-            'desc'      => '开户账号名称',
-            'match'     => 'option',
-            'update'    => 'text',
-        ),
-
-        'area'       => array
-        (
-            'type'      => 'varchar-500',
-            'name'      => '开户所在地',
-            'default'   => '',
-            'desc'      => '开户所在地',
-            'match'     => 'option',
-            'search'    => 'linkage',
-            'update'    => 'linkage',
-            'value'     => $shop ? $shop['area'] : false,
-            'option'    => Dever::url('api.get?level_total=2', 'area'),
-            //'list'      => 'Dever::load("area/api.string", "{area}")',
-        ),
-
-        'bank_acct_noname'      => array
-        (
-            'type'      => 'varchar-50',
-            'name'      => '开户行名称-银行名称和支行名称用/隔开，如：招商/天通苑',
-            'default'   => '',
-            'desc'      => '开户行名称',
+            'name'      => '企业类型',
+            'default'   => '2',
+            'desc'      => '企业类型',
             'match'     => 'option',
-            'update'    => 'text',
+            'update'    => 'radio',
+            'option'    => $mer_type,
+            'tab'       => 2,
         ),
 
-        'legalmanHomeAddr'      => array
+        'company_name'      => array
         (
-            'type'      => 'varchar-50',
-            'name'      => '法人地址',
+            'type'      => 'varchar-200',
+            'name'      => '企业名称',
             'default'   => '',
-            'desc'      => '法人地址',
+            'desc'      => '企业名称',
             'match'     => 'option',
             'update'    => 'text',
+            'value'     => $shop ? $shop['company_name'] : false,
+            'tab'       => 2,
         ),
 
-        // 'province'      => array
-        // (
-        //     'type'      => 'int-11',
-        //     'name'      => '省份',
-        //     'default'   => '',
-        //     'desc'      => '省份',
-        //     'match'     => 'option',
-        //     //'update'  => 'text',
-        // ),
-
-        // 'city'      => array
-        // (
-        //     'type'      => 'int-11',
-        //     'name'      => '城市',
-        //     'default'   => '',
-        //     'desc'      => '城市',
-        //     'match'     => 'option',
-        //     //'update'  => 'text',
-        // ),
-
-        // 'county'      => array
-        // (
-        //     'type'      => 'int-11',
-        //     'name'      => '县区',
-        //     'default'   => '',
-        //     'desc'      => '县区',
-        //     'match'     => 'option',
-        //     //'update'  => 'text',
-        // ),
-
         'license'     => array
         (
             'type'      => 'varchar-150',
-            'name'      => '营业执照',
+            'name'      => '企业营业执照',
             'default'   => '',
             'desc'      => '营业执照',
             'match'     => 'option',
@@ -260,77 +267,90 @@ return array
             'key'       => '8',
             'value'     => $shop ? $shop['license'] : false,
             'place'     => '660*660',
+            'tab'       => 2,
         ),
 
         'license_number'      => array
         (
             'type'      => 'varchar-200',
-            'name'      => '营业执照号码',
+            'name'      => '企业营业执照号码',
             'default'   => '',
             'desc'      => '营业执照号码',
             'match'     => 'option',
             'value'     => $shop ? $shop['license_number'] : false,
             'update'    => 'text',
+            'tab'       => 2,
         ),
 
-        'tax'     => array
+        'bank_acct_type'      => array
         (
-            'type'      => 'varchar-150',
-            'name'      => '税务登记证',
+            'type'      => 'int-11',
+            'name'      => '开户行账户类型',
+            'default'   => '-1',
+            'desc'      => '账户类型',
+            'match'     => 'option',
+            'update'    => 'radio',
+            'option'    => $acct_type,
+            'tab'       => 3,
+        ),
+
+        'back_no'      => array
+        (
+            'type'      => 'varchar-50',
+            'name'      => '开户行行号',
             'default'   => '',
-            'desc'      => '税务登记证',
+            'desc'      => '开户行行号',
             'match'     => 'option',
-            'update'    => 'image',
-            'key'       => '8',
-            'place'     => '660*660',
+            // 'update'    => 'text',
+            'tab'       => 3,
         ),
 
-        'door'     => array
+        'shop_addr_ext'      => array
         (
-            'type'      => 'varchar-150',
-            'name'      => '门头照片',
+            'type'      => 'varchar-50',
+            'name'      => '开户行地址',
             'default'   => '',
-            'desc'      => '门头照片',
+            'desc'      => '开户行地址',
             'match'     => 'option',
-            'update'    => 'image',
-            'key'       => '8',
-            'place'     => '660*660',
+            // 'update'    => 'text',
+            'tab'       => 3,
         ),
 
-        'open'     => array
+        'bank_acct_no'      => array
         (
-            'type'      => 'varchar-150',
-            'name'      => '开户许可证',
+            'type'      => 'varchar-50',
+            'name'      => '开户行账号',
             'default'   => '',
-            'desc'      => '开户许可证',
+            'desc'      => '开户行账号',
             'match'     => 'option',
-            'update'    => 'image',
-            'key'       => '8',
-            'place'     => '660*660',
+            'update'    => 'text',
+            'tab'       => 3,
         ),
 
-        'hand_idcard'     => array
+        'area'       => array
         (
-            'type'      => 'varchar-150',
-            'name'      => '手持身份证自拍照',
+            'type'      => 'varchar-500',
+            'name'      => '开户所在地',
             'default'   => '',
-            'desc'      => '手持身份证自拍照',
+            'desc'      => '开户所在地',
             'match'     => 'option',
-            'update'    => 'image',
-            'key'       => '8',
-            'place'     => '660*660',
+            'search'    => 'linkage',
+            'update'    => 'linkage',
+            'value'     => $shop ? $shop['area'] : false,
+            'option'    => Dever::url('api.get?level_total=2', 'area'),
+            //'list'      => 'Dever::load("area/api.string", "{area}")',
+            'tab'       => 3,
         ),
 
-        'house_pic'     => array
+        'bank_acct_noname'      => array
         (
-            'type'      => 'varchar-150',
-            'name'      => '室内照片',
+            'type'      => 'varchar-50',
+            'name'      => '开户行名称-银行名称和支行名称用/隔开，如：招商/天通苑',
             'default'   => '',
-            'desc'      => '室内照片',
+            'desc'      => '开户行名称',
             'match'     => 'option',
-            'update'    => 'image',
-            'key'       => '8',
-            'place'     => '660*660',
+            'update'    => 'text',
+            'tab'       => 3,
         ),
 
         'bank_fount'     => array
@@ -343,6 +363,7 @@ return array
             'update'    => 'image',
             'key'       => '8',
             'place'     => '660*660',
+            'tab'       => 3,
         ),
 
         'bank_back'     => array
@@ -355,42 +376,20 @@ return array
             'update'    => 'image',
             'key'       => '8',
             'place'     => '660*660',
+            'tab'       => 3,
         ),
 
-        'mccCode'      => array
-        (
-            'type'      => 'varchar-200',
-            'name'      => '行业类别编码',
-            'default'   => '5499',
-            'desc'      => '行业类别编码',
-            'match'     => 'option',
-            // 'update'    => 'text',
-        ),
-
-        'idcard_front'     => array
-        (
-            'type'      => 'varchar-150',
-            'name'      => '身份证正面',
-            'default'   => '',
-            'desc'      => '身份证正面',
-            'match'     => 'option',
-            'update'    => 'image',
-            'key'       => '8',
-            'place'     => '660*660',
-            'value'     => $shop ? $shop['idcard_front'] : false,
-        ),
-
-        'idcard_back'     => array
+        'open'     => array
         (
             'type'      => 'varchar-150',
-            'name'      => '身份证背面',
+            'name'      => '开户许可证',
             'default'   => '',
-            'desc'      => '身份证背面',
+            'desc'      => '开户许可证',
             'match'     => 'option',
             'update'    => 'image',
             'key'       => '8',
             'place'     => '660*660',
-            'value'     => $shop ? $shop['idcard_back'] : false,
+            'tab'       => 3,
         ),
 
         'state'     => array
@@ -416,5 +415,6 @@ return array
 	'manage' => array
     (
         //'list' => 'update',
+        'tab' => array('门店信息', '法人信息', '企业信息', '银行信息'),
     ),
 );

app/shop/lib/Sign.php

@@ -104,7 +104,12 @@ Class Sign {
     	$data['bank_acct_type'] = $sign['bank_acct_type'];#账户类型
 
     	$data['bank_acct_no'] = $sign['bank_acct_no'];#开户行账号
-    	$data['bank_acct_name'] = $sign['bank_acct_name'];#开户账号名称
+    	if ($sing['acct_type'] == 1) {
+    		$data['bank_acct_name'] = $sign['company_name'];#开户账号名称
+    	} else {
+    		$data['bank_acct_name'] = $sign['name'];#开户账号名称
+    	}
+    	
     	$data['mccCode'] = '5499';
     	$area = explode(',',$shop['area']);
     	$data['shop_province_id'] = $area[0]/10000;

service/agent/database/order.php

@@ -139,6 +139,7 @@ if($search_auth == 1){
         $excel[] = array('软件服务费数据导出','软件服务费数据导出', 'agent/lib/order.out_softorder');
     }
 }
+$list_button['oper'] = array('删除订单', '"agent/lib/manage.setOrderStatus?id={id}&value=7"', '{status} <= 1 || {status} == 5');
 $search_pmid = Dever::input('search_in_parent_mid');
 
 $invite_type = array

service/agent/lib/Manage.php

@@ -1021,6 +1021,14 @@ class Manage
                 $where['history_status'] = $order['status'];
             }
             Dever::db('agent/order')->update($where);
+
+            if ($where['status'] == 7 && $order['get_type'] == 1) {
+                # 关闭订单
+                $member = Dever::db('agent/member')->find($order['mid']);
+                if ($member) {
+                    Dever::db('agent/member')->update(array('where_id' => $member['id'], 'state' => 2));
+                }
+            }
         }
         
 

service/agent/lib/Member.php

@@ -11,7 +11,7 @@ class Member
         if ($id < 0) {
             return '无';
         }
-        $member = Dever::db($table)->find($id);
+        $member = Dever::db($table)->one($id);
         if ($member) {
             if (isset($member['mid'])) {
                 $member['id'] = $member['mid'];  

service/agent/lib/Order.php

@@ -539,12 +539,12 @@ class Order
 
         $member = array();
         if ($info['mid'] > 0) {
-            $member = Dever::db('agent/member')->find($info['mid']);
+            $member = Dever::db('agent/member')->one($info['mid']);
         }
         
         $parent_member = array();
         if ($info['parent_mid'] > 0) {
-            $parent_member = Dever::db('agent/member')->find($info['parent_mid']);
+            $parent_member = Dever::db('agent/member')->one($info['parent_mid']);
         }
 
         $cdate = date('Y-m-d H:i', $info['cdate']);
@@ -778,6 +778,18 @@ class Order
             }
         }
 
+        if (Dever::load('manage/auth')->checkFunc('agent.order', 'close', '取消订单')) {
+            if ($info['status'] <= 1 || $info['status'] == 5) {
+                # 未完成审核的订单，可以随时挂起
+                $button[] = array
+                (
+                    'type' => 'action',
+                    'link' => Dever::url('lib/manage.setOrderStatus?id=' . $info['id'] . '&value=7', 'agent'),
+                    'name' => '取消订单',
+                );
+            }
+        }
+
         if ($info['status'] == 1) {
             # 根据价值获取名额
             $prize = Dever::db('setting/prize')->find(array('type' => 1, 'price' => $info['price']));