edit

app/shop/database/sign.php

@@ -163,6 +163,17 @@ return array
             'tab'       => 0,
         ),
 
+        'shop_address'       => array
+        (
+            'type'      => 'varchar-1000',
+            'name'      => '门店地址',
+            'default'   => '',
+            'desc'      => '门店地址',
+            'match'     => 'option',
+            'update'    => 'text',
+            //'list'        => true,
+        ),
+
         'mccCode'      => array
         (
             'type'      => 'varchar-200',
@@ -536,7 +547,7 @@ return array
             'fast' => array('打款确认', '"sign&where_id={id}&col=cash"', '{step} == 2'),
             'copy' => array('复制链接', 'shop/lib/sign.getAgreement?sign_id={id}', '{step} == 4'),
             'list' => array('查看日志', '"sign_log&search_option_sign_id={id}&oper_table=sign"'),
-            'fast1' => array('绑定门店', '"sign&where_id={id}&col=create_shop,shop_id"', '{step} == 5'),
+            'fast1' => array('绑定门店', '"sign&where_id={id}&col=create_shop,shop_id"', '({step} == 5 || {step} == 6)'),
         )
     ),
 

app/shop/database/sign_log.php

@@ -27,6 +27,7 @@ return array
     'lang' => '自主签约日志',
     # 后台菜单排序
     'order' => 99,
+    'step' => $step,
     'menu' => false,
     # 数据结构
     'struct' => array

app/shop/lib/Manage.php

@@ -10,8 +10,8 @@ class Manage
     public function sign($id, $name, $data)
     {
         $cash = Dever::param('cash', $data);
+        $sign = Dever::db('shop/sign')->find($id);
         if ($cash && $cash > 0) {
-            $sign = Dever::db('shop/sign')->find($id);
             Dever::load('shop/lib/sign')->account_check($sign, $cash);
         }
 
@@ -25,10 +25,40 @@ class Manage
                 }
 
                 Dever::load('shop/lib/sign')->bind($id, $shop_id);
-            } else {
+            } elseif ($create_shop == 2) {
                 # 生成门店
-                Dever::alert('暂时无法生成门店');
+                //Dever::alert('暂时无法生成门店');
+                $shop_id = $this->createShop($sign);
+                if ($shop_id) {
+                    Dever::load('shop/lib/sign')->bind($id, $shop_id);
+                }
+            }
+        }
+    }
+
+    private function createShop($info)
+    {
+        $data['name'] = $info['shop_name'];
+        $data['truename'] = $info['name'];
+        $data['mobile'] = $info['mobile'];
+        $data['type'] = 1;
+        $state = Dever::db('shop/info')->find($data);
+        if ($state) {
+            if (!$state['mid']) {
+                return $state['id'];
+            } else {
+                return false;
             }
+        } else {
+            $data['area'] = $info['shop_area'];
+            $data['address'] = $info['shop_address'];
+            $data['license'] = $info['license'];
+            $data['license_number'] = $info['license_number'];
+            $data['company_name'] = $info['company_name'];
+            $data['idcard_front'] = $info['idcard_front'];
+            $data['idcard_back'] = $info['idcard_back'];
+            $data['license'] = $info['license'];
+            return Dever::db('shop/info')->insert($data);
         }
     }
 

app/shop/lib/Sign.php

@@ -51,8 +51,12 @@ Class Sign {
 		if ($shop['mid']) {
 			Dever::alert('门店已绑定银联商户号');
 		}
+		$old_shop = Dever::db('shop/info')->find(array('mid' => $sign['mid']));
 		$state = Dever::db('shop/info')->update(array('where_id' => $shop_id, 'mid' => $sign['mid'], 'sign_id' => $sign['id']));
 		if ($state) {
+			if ($old_shop && $old_shop['id'] != $shop_id) {
+				Dever::db('shop/info')->update(array('where_id' => $old_shop['id'], 'mid' => 'null', 'sign_id' => '-1'));
+			}
 			$this->log(100, $sign, '门店['.$shop['name'].']绑定成功');
 		} else {
 			Dever::db('shop/sign')->update(array('where_id' => $sign_id, 'shop_id' => '-1'));
@@ -74,7 +78,7 @@ Class Sign {
 		$log = Dever::db('shop/sign_log')->find(array('sign_id' => $sign['id']));
 		if ($log) {
 			$date = date('Y-m-d H:i', $log['cdate']);
-			$step = Dever::db('shop/sign')->config['step'][$log['step']];
+			$step = Dever::db('shop/sign_log')->config['step'][$log['step']];
 			return $date . '<br />' . $step . '<br />' . $log['desc'];
 		}
 	}