合并分支 'liuzhen' 到 'master'

商家入驻调试



查看合并请求 !113

@@ -277,6 +277,7 @@ class House extends Api
     "name"://小区名称
     "area"://所在区
     "address"://地址
+    "price"://入驻金额
     "shen_status"://状态0选择1申请中2已绑定
     }
     ]
@@ -300,7 +301,7 @@ class House extends Api
         //查询该市区下的所有小区
         $data = Db::name('house')
             ->where($where)
-            ->field('id,name,area,address')
+            ->field('id,name,area,address,price')
             ->order('createtime desc')
             ->select();
 

@@ -256,6 +256,7 @@ class Store extends Api
         } else {
             $this->error($order_result['return_msg']);
         }
+        $param['money'] = $this->house_model->whereIn('id',$param['house_ids'])->sum('price');
         Db::startTrans();
         $result = false;
         $result_invite = true;
@@ -979,6 +980,7 @@ class Store extends Api
         } else {
             $this->error($order_result['return_msg']);
         }
+        $param['money'] = $this->house_model->whereIn('id',$param['house_ids'])->sum('price');
         $model = new StoreOrder();
         Db::startTrans();
         $result = false;