Merge branch 'master' of http://114.215.101.231:8099/guosheng/community into Branch_liuzhen

@@ -701,6 +701,7 @@ class User extends Api
 		"data": [{
 		"data": [{
 			"memo": "测试", //标题
 			"memo": "测试", //标题
 			"money": "10.00", //金额
 			"money": "10.00", //金额
+            "status": 0, //状态:0=无状态,1=审核中,2=审核通过,3=审核失败
 			"createtime": "2020-08-29 17:07:56" // 时间
 			"createtime": "2020-08-29 17:07:56" // 时间
 		}]
 		}]
 	})
 	})
@@ -712,7 +713,7 @@ class User extends Api
         $where = ['user_id'=>$this->auth->id];
         $where = ['user_id'=>$this->auth->id];
         $total_num = UserMoneyLog::where($where)->count();
         $total_num = UserMoneyLog::where($where)->count();
         $list = UserMoneyLog::where($where)
         $list = UserMoneyLog::where($where)
-        	->field("memo,money,from_unixtime(createtime, '%Y-%m-%d %H:%i:%S') createtime")
+        	->field("memo,money,status,from_unixtime(createtime, '%Y-%m-%d %H:%i:%S') createtime")
             ->page($page,$pageNum)
             ->page($page,$pageNum)
             ->order('createtime','DESC')
             ->order('createtime','DESC')
         	->select();
         	->select();

@@ -16,6 +16,7 @@ use think\Db;
 use app\common\controller\Frontend;
 use app\common\controller\Frontend;
 use app\api\model\UserHouse;
 use app\api\model\UserHouse;
 use app\api\model\House;
 use app\api\model\House;
+use app\api\model\HousePhone;
 
 
 /**
 /**
  * 微信接口
  * 微信接口
@@ -91,11 +92,23 @@ class Wechat extends Frontend
     private function joinHouse($house_id,$openid){
     private function joinHouse($house_id,$openid){
         $user = WechatService::getUserByOpenid($openid);
         $user = WechatService::getUserByOpenid($openid);
         $house = House::get($house_id);
         $house = House::get($house_id);
+        // 发送内容
+        $content = "欢迎关注{$house['name']}!";
+        $phoneList = HousePhone::where('house_id',$house_id)->select();
+        if(!empty($phoneList)){
+            $content .= "\n";
+            foreach ($phoneList as $v) {
+                $content .= "\n"."{$v['name']}:{$v['phone']}";
+            }
+        }
+        $content .= "\n\n"."业主账号：%u"
+            ."\n\n"."<a href='https://weixin.qq.com/'>查看物业公告</a>"
+            ."\n\n"."<a href='https://weixin.qq.com/'>给物业留言</a>";
         //*------------------------已有账号，直接加入小区-----------------------*/
         //*------------------------已有账号，直接加入小区-----------------------*/
         if($user){
         if($user){
             $info = UserHouse::get(['user_id'=>$user['id'],'house_id'=>$house_id]);
             $info = UserHouse::get(['user_id'=>$user['id'],'house_id'=>$house_id]);
             if(!empty($info) && $info['status'] == 2){
             if(!empty($info) && $info['status'] == 2){
-                return "您已加入【{$house['name']}】社区";
+                return sprintf($content,$user['id_num']);
             }
             }
             Db::startTrans();
             Db::startTrans();
             try {
             try {
@@ -128,7 +141,7 @@ class Wechat extends Frontend
                 Db::rollback();
                 Db::rollback();
                 return $e->getMessage();
                 return $e->getMessage();
             }
             }
-            return "您已成功加入【{$house['name']}】社区";
+            return sprintf($content,$user['id_num']);
         }
         }
         /*------------------------没有账号，先注册，后加入小区-----------------------*/
         /*------------------------没有账号，先注册，后加入小区-----------------------*/
         $access_token = WechatService::getAccessToken();
         $access_token = WechatService::getAccessToken();
@@ -180,7 +193,7 @@ class Wechat extends Frontend
             Db::rollback();
             Db::rollback();
             return $e->getMessage();
             return $e->getMessage();
         }
         }
-        return "您已加入【{$house['name']}】社区";
+        return sprintf($content,$user['id_num']);
     }
     }
 
 
 }
 }