提交

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/BillController.java

@@ -34,21 +34,19 @@ public class BillController extends BaseController {
 	private BillServiceI billServiceI;
 	
 	@ApiOperation(value = "获取本人的收费账单信息(已缴费或未缴费)", notes = "获取本人的收费账单信息(已缴费或未缴费)")
-	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
-			@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "payType", value = "0是未缴费1是已缴费"),
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "Integer", name = "payType", value = "0是未缴费1是已缴费"),
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
 			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
 	})
 	@RequestMapping(value = "/bills/current_user/{payType}",method = RequestMethod.GET)
-	public ResponseBean getBillInvoice(@PathVariable Integer communityId,
-									   @PathVariable Integer payType,
+	public ResponseBean getBillInvoice(@PathVariable Integer payType,
 									   @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 									   @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize, HttpSession session){
 		UserElement userElement = getUserElement(session);
 		ResponseBean responseBean = new ResponseBean();
 
-		if (!check(communityId)) {
+		if (!check(userElement.getCommunityId())) {
 			responseBean.addError("小区不存在");
 			return responseBean;
 		}

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/WxLoginController.java

@@ -29,7 +29,7 @@ public class WxLoginController {
 	/**
 	 * 微信登录
 	 */
-	@RequestMapping("/wxLogin/{wxcode}")
+	@RequestMapping(value = "/wxLogin/{wxcode}", method = RequestMethod.POST)
 	public ResponseBean autoLogin(@PathVariable String wxcode, HttpServletRequest request) {
 		ResponseBean responseBean = new ResponseBean();
 		if (StringUtils.isEmpty(wxcode)){

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/WxPayController.java

@@ -1,5 +1,6 @@
 package com.community.huiju.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.redis.RedisTemplate;
@@ -19,19 +20,15 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.lang.reflect.Type;
+import java.util.*;
 
 /**
  * @author FXF
@@ -48,8 +45,10 @@ public class WxPayController {
 	private WxPayServiceI wxPayService;
 	
 	@ApiOperation(value = "统一下单", notes = "统一下单")
-	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "Integer", name = "billInvoiceId", value = "账单Id"),
-			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token") })
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "outTradeNo", value = "订单号"),
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+	})
 	@RequestMapping(value = "/wxUnifiedOrder/{outTradeNo}",method = RequestMethod.GET)
 	public ResponseBean wxUnifiedOrder(@PathVariable("outTradeNo") String outTradeNo, HttpSession session){
 		ResponseBean responseBean = new ResponseBean();
@@ -115,12 +114,15 @@ public class WxPayController {
 	}
 	
 	@ApiOperation(value = "订单查询", notes = "订单查询")
-	@RequestMapping(value = "/wxOrderQuery",method = RequestMethod.GET)
-	public ResponseBean wxOrderQuery(){
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "outTradeNo", value = "订单号")
+	})
+	@RequestMapping(value = "/wxOrderQuery/{outTradeNo}",method = RequestMethod.GET)
+	public ResponseBean wxOrderQuery(@PathVariable("outTradeNo") String outTradeNo){
 		ResponseBean responseBean = new ResponseBean();
 		Map<String, String> resp = Maps.newHashMap();
 		try {
-			resp = wxPayService.wxOrderQuery();
+			resp = wxPayService.wxOrderQuery(outTradeNo);
 		} catch (Exception e) {
 			e.printStackTrace();
 			responseBean.addError("查询失败");
@@ -131,15 +133,18 @@ public class WxPayController {
 	}
 	
 	@ApiOperation(value = "准备开始支付", notes = "准备开始支付")
-	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "Integer", name = "billInvoiceId", value = "账单Id"),
-			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token") })
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "Integer", name = "billInvoiceIdList", value = "账单Id集合"),
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+	})
 	@RequestMapping(value = "/wxStartPay",method = RequestMethod.POST)
-	public ResponseBean wxStartPay(List<Integer> billInvoiceIdList, HttpSession session){
+	public ResponseBean wxStartPay(@RequestBody String billInvoiceIdList, HttpSession session){
 		ResponseBean responseBean = new ResponseBean();
 		try {
 			UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-			String outTradeNo = wxPayService.wxStartPay(billInvoiceIdList, userElement);
+			 Integer[] integers = JSONObject.parseArray(billInvoiceIdList).toArray(new Integer[]{});
 
+			String outTradeNo = wxPayService.wxStartPay( Arrays.asList(integers), userElement);
 			Map<String,Object> resultMap = Maps.newHashMap();
 			resultMap.put("outTradeNo", outTradeNo);
 			responseBean.addSuccess(resultMap);
@@ -152,8 +157,10 @@ public class WxPayController {
 	}
 	
 	@ApiOperation(value = "取消支付", notes = "取消支付")
-	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "Integer", name = "billInvoiceId", value = "账单Id"),
-			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token") })
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "outTradeNo", value = "订单号"),
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+	})
 	@RequestMapping(value = "/wxCancelPay/{outTradeNo}",method = RequestMethod.POST)
 	public ResponseBean wxCancelPay(@PathVariable("outTradeNo") String outTradeNo, HttpSession session){
 		ResponseBean responseBean = new ResponseBean();

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpBillOrder.java

@@ -21,6 +21,11 @@ public class TpBillOrder {
 
     private Date updateDate;
 
+    /**
+     *  0：未支付  1: 已支付 2: 正在支付中
+     */
+    private String orderStatus;
+
     public Integer getId() {
         return id;
     }
@@ -92,4 +97,12 @@ public class TpBillOrder {
     public void setUpdateDate(Date updateDate) {
         this.updateDate = updateDate;
     }
+
+    public String getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(String orderStatus) {
+        this.orderStatus = orderStatus;
+    }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/WxPayServiceI.java

@@ -25,7 +25,7 @@ public interface WxPayServiceI {
 	 * 订单查询
 	 * @return
 	 */
-	Map<String, String> wxOrderQuery() throws Exception;
+	Map<String, String> wxOrderQuery(String outTradeNo) throws Exception;
 	
 	/**
 	 * 准备支付

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/BillServiceImpl.java

@@ -1,13 +1,11 @@
 package com.community.huiju.service.impl;
 
 import com.community.commom.session.UserElement;
-import com.community.huiju.dao.TaSysRoleMapper;
-import com.community.huiju.dao.TaUserMapper;
-import com.community.huiju.dao.TaUserVerifyMapper;
-import com.community.huiju.dao.TpBillInvoiceMapper;
+import com.community.huiju.dao.*;
 import com.community.huiju.model.TaSysRole;
 import com.community.huiju.model.TaUser;
 import com.community.huiju.model.TaUserVerify;
+import com.community.huiju.model.TpBuildingOwnerInfo;
 import com.community.huiju.service.BillServiceI;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
@@ -36,6 +34,9 @@ public class BillServiceImpl implements BillServiceI {
 
 	@Autowired
 	private TaUserVerifyMapper taUserVerifyMapper;
+
+	@Autowired
+	private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
 	
 	/**
 	 * 根据payType分页获取缴费或未缴费的数据
@@ -47,16 +48,30 @@ public class BillServiceImpl implements BillServiceI {
 	 */
 	@Override
 	public Map<String, Object> getBillsList(UserElement userElement, Integer payType, Integer pageNum, Integer pageSize) {
-		//使用分页插件
-		Page<Map<String,Object>> page = PageHelper.startPage(pageNum, pageSize);
+
 
 		/**
-		 * 账单 关联的是房产, 查询 审核表， 审核表里面的 roomNoId 就是楼栋资料库的id
+		 * 账单 关联的是房产,
  		 */
 
-		TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
+		/**
+		 * 获取这个房产的业主
+		 */
 
-		List<Map<String,Object>> billsList = tpBillInvoiceMapper.getBillsList(userElement.getCommunityId(), userVerify.getRoomNoId(), payType);
+		TaUserVerify userVerify = taUserVerifyMapper.selectCommunityAndAddressAndRoleId(userElement.getCommunityId(),
+										userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(),
+										userElement.getLevelId(), userElement.getRoomNoId());
+		// 业主信息
+		TaUser user = taUserMapper.selectByPrimaryKey(userVerify.getUserId());
+
+		TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityAndAddressAndPhone(userElement.getCommunityId(),
+				userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(),
+				userElement.getLevelId(), userElement.getRoomNoId(), user.getLoginName());
+
+
+		//使用分页插件
+		Page<Map<String,Object>> page = PageHelper.startPage(pageNum, pageSize);
+		List<Map<String,Object>> billsList = tpBillInvoiceMapper.getBillsList(userElement.getCommunityId(), tpBuildingOwnerInfo.getId(), payType);
 		billsList.forEach(e-> {
 			String payPrice = String.valueOf(e.get("payPrice"));
 			Double payPriceDouble = Double.parseDouble(payPrice) / 100;

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

@@ -13,6 +13,7 @@ import com.community.huiju.common.code.ICode;
 import com.community.huiju.common.code.cache.AppkeyCache;
 import com.community.huiju.common.hk.HKConstant;
 import com.community.huiju.common.hk.HKOpenApi;
+import com.community.huiju.common.perproties.LoginCodePerproties;
 import com.community.huiju.common.welcome.OkHttpRequestUtils;
 import com.community.huiju.common.welcome.WelcomeProperties;
 import com.community.huiju.dao.*;
@@ -100,6 +101,9 @@ public class TaUserServiceImpl implements ITaUserService {
     @Autowired
     private TaUserVerifyMapper taUserVerifyMapper;
 
+    @Autowired
+    private LoginCodePerproties loginCodePerproties;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean login(String loginName, String code) {
@@ -110,7 +114,7 @@ public class TaUserServiceImpl implements ITaUserService {
 
         TaUser currentUser = hasUserPhone(loginName);
         if (null == currentUser) {
-            response.addError("未注册，请先注册");
+            response.addError("未注册，请先注册", loginCodePerproties.getLoginCode().get(UserVerifyEnum.NO_UNREGISTERED.getCode()));
             return response;
         }
 
@@ -189,7 +193,7 @@ public class TaUserServiceImpl implements ITaUserService {
         List<TaUserVerify> taUserVerifies = taUserVerifyMapper.selectByUserId(currentUser.getId());
         // 无关联房产
         if (null == taUserVerifies || taUserVerifies.size() == 0) {
-            response.addSuccess(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getCode(), UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getMsg(), taUserVO);
+            response.addSuccess(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getMsg(), taUserVO, loginCodePerproties.getLoginCode().get(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getCode()));
             return response;
         }
 
@@ -204,7 +208,7 @@ public class TaUserServiceImpl implements ITaUserService {
 
             return checkHouse(response, taUserVO, userVerify);
         } else if (taUserVerifies.size() >= 2) {
-            response.addSuccess(UserVerifyEnum.A_MULTIPLE_REAL_ESTATE.getCode(), taUserVO);
+            response.addSuccess(UserVerifyEnum.A_MULTIPLE_REAL_ESTATE.getMsg(), taUserVO, loginCodePerproties.getLoginCode().get(UserVerifyEnum.A_MULTIPLE_REAL_ESTATE.getCode()));
             return response;
         }
 
@@ -1036,12 +1040,12 @@ public class TaUserServiceImpl implements ITaUserService {
             TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(userVerify.getRoleId());
             taUserVO.setRole(taSysRole.getRoleName());
 
-            responseBean.addSuccess(UserVerifyEnum.A_AUDIT_REAL_ESTATE.getCode(), taUserVO);
+            responseBean.addSuccess(UserVerifyEnum.A_AUDIT_REAL_ESTATE.getMsg(), taUserVO, loginCodePerproties.getLoginCode().get(UserVerifyEnum.A_AUDIT_REAL_ESTATE.getCode()));
             return responseBean;
         }
         String resultCode = "0".equals(verifyStatus) ? UserVerifyEnum.A_TO_AUDIT_REAL_ESTATE.getCode() :
                 "2".equals(verifyStatus) ? UserVerifyEnum.A_AUDIT_FAILED_REAL_ESTATE.getCode() : "500";
-        responseBean.addSuccess(resultCode, UserVerifyEnum.getMsg(resultCode), taUserVO);
+        responseBean.addSuccess(UserVerifyEnum.getMsg(resultCode), taUserVO, loginCodePerproties.getLoginCode().get(resultCode));
         return responseBean;
     }
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/WxLoginServiceImpl.java

@@ -3,6 +3,7 @@ package com.community.huiju.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.common.code.ICode;
+import com.community.huiju.common.perproties.LoginCodePerproties;
 import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.enums.UserVerifyEnum;
 import com.community.huiju.model.TaUser;
@@ -45,6 +46,8 @@ public class WxLoginServiceImpl implements WxLoginServiceI {
 	@Qualifier("phoneCodeImpl")
 	private ICode iCode;
 
+	@Autowired
+	private LoginCodePerproties loginCodePerproties;
 	
 	@Override
 	public ResponseBean getOpenidByWxcode(String wxcode) {
@@ -69,7 +72,7 @@ public class WxLoginServiceImpl implements WxLoginServiceI {
 			result.put("userInfo", userInfo);
 			result.put("openid", openId);
 
-			responseBean.addSuccess(UserVerifyEnum.NO_ACCOUNT.getCode(), UserVerifyEnum.NO_ACCOUNT.getMsg(), result);
+			responseBean.addSuccess(UserVerifyEnum.NO_ACCOUNT.getMsg(), result, loginCodePerproties.getLoginCode().get(UserVerifyEnum.NO_ACCOUNT.getCode()));
 			return responseBean;
 		}
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/WxPayServiceImpl.java

@@ -52,6 +52,12 @@ public class WxPayServiceImpl implements WxPayServiceI {
 	@Autowired
 	private TpBillOrderMapper tpBillOrderMapper;
 
+	@Autowired
+	private TaUserVerifyMapper taUserVerifyMapper;
+
+	@Autowired
+	private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
+
 	/**
 	 * 微信支付统一下单
 	 *
@@ -106,6 +112,16 @@ public class WxPayServiceImpl implements WxPayServiceI {
 		secondSignData.put("timestamp", String.valueOf(timestamp));
 		secondSignData.put("package", "Sign=WXPay");
 		secondSignData.put("sign", WXPayUtil.generateSignature(secondSignData, config.getKey(), WXPayConstants.SignType.MD5));
+
+		log.info("订单: {}， 状态变更为正在支付", orderNo);
+
+		// 更改订单状态 为正在支付
+		List<TpBillOrder> billOrders = tpBillOrderMapper.selectByOrderBumber(orderNo);
+		billOrders.forEach(e-> {
+			e.setOrderStatus("3");
+			tpBillOrderMapper.updateByPrimaryKeySelective(e);
+		});
+
 		return secondSignData;
 	}
 	
@@ -128,9 +144,6 @@ public class WxPayServiceImpl implements WxPayServiceI {
 
 		for ( TpBillOrder billOrder : billOrderList){
 			TpBillInvoice tpBillInvoice = tpBillInvoiceMapper.selectByPrimaryKey(billOrder.getTpBillInvoiceId());
-			if (!tpBillInvoice.getBillStatus().equals("3")){
-				return "订单状态出错";
-			}
 
 			// 更新为正在支付状态
 			// 更改收费单的 缴费时间, 修改人, 修改时间
@@ -169,15 +182,24 @@ public class WxPayServiceImpl implements WxPayServiceI {
 			tpBillMapper.updateByPrimaryKeySelective(tpBill);
 
 			// 把相对应的APP端, 代办消息设置为无效
-			Map<String, Object> map = Maps.newHashMap();
-			map.put("communityId", tpBillInvoice.getCommunityId());
-			map.put("billInvoiceId", tpBillInvoice.getId());
-			map.put("userId", tpBillInvoice.getTaUserId());
-			TpMessage tpMessage = tpMessageMapper.selectBillinvoiceMessage(map);
-			tpMessage.setStatus("0");
-			tpMessageMapper.updateByPrimaryKeySelective(tpMessage);
+//			Map<String, Object> map = Maps.newHashMap();
+//			map.put("communityId", tpBillInvoice.getCommunityId());
+//			map.put("billInvoiceId", tpBillInvoice.getId());
+//			map.put("userId", tpBillInvoice.getTaUserId());
+//			TpMessage tpMessage = tpMessageMapper.selectBillinvoiceMessage(map);
+//			tpMessage.setStatus("0");
+//			tpMessageMapper.updateByPrimaryKeySelective(tpMessage);
 		}
 
+		log.info("订单: {}， 状态变更为支付成功", outTradeNo);
+
+		// 更改订单状态 为支付成功
+		List<TpBillOrder> billOrders = tpBillOrderMapper.selectByOrderBumber(outTradeNo);
+		billOrders.forEach(e-> {
+			e.setOrderStatus("1");
+			tpBillOrderMapper.updateByPrimaryKeySelective(e);
+		});
+
 		return "success";
 	}
 	
@@ -187,12 +209,12 @@ public class WxPayServiceImpl implements WxPayServiceI {
 	 * @return
 	 */
 	@Override
-	public Map<String, String> wxOrderQuery() throws Exception {
+	public Map<String, String> wxOrderQuery(String outTradeNo) throws Exception {
 		HfWxConfig config = new HfWxConfig();
 		WXPay wxpay = new WXPay(config);
 		
 		Map<String, String> data = new HashMap<String, String>();
-		data.put("out_trade_no", "2019021910595900000012");
+		data.put("out_trade_no", outTradeNo);
 		return wxpay.orderQuery(data);
 	}
 	
@@ -202,14 +224,29 @@ public class WxPayServiceImpl implements WxPayServiceI {
 
 		// 如果是家属/租客, 应该用业主的用户id
 		TaUser taUser = taUserMapper.selectByPrimaryKey(userElement.getId());
+
 		List<TpBillOrder> billOrderList = Lists.newArrayList();
 
 		Random random = new Random();
 		String orderNo = String.valueOf(System.currentTimeMillis()) + random.nextInt();
 
+		/**
+		 * 获取这个房产的业主
+		 */
+
+		TaUserVerify userVerify = taUserVerifyMapper.selectCommunityAndAddressAndRoleId(userElement.getCommunityId(),
+				userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(),
+				userElement.getLevelId(), userElement.getRoomNoId());
+		// 业主信息
+		TaUser user = taUserMapper.selectByPrimaryKey(userVerify.getUserId());
+
+		TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityAndAddressAndPhone(userElement.getCommunityId(),
+				userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(),
+				userElement.getLevelId(), userElement.getRoomNoId(), user.getLoginName());
+
 		//获取支付金额
 		for (Integer billInvoiceId : billInvoiceIdArray) {
-			TpBillInvoice tpBillInvoice = tpBillInvoiceMapper.selectByIdAndBuildingOwnerInfoId(billInvoiceId,userElement.getRoomNoId(),userElement.getCommunityId());
+			TpBillInvoice tpBillInvoice = tpBillInvoiceMapper.selectByIdAndBuildingOwnerInfoId(billInvoiceId,tpBuildingOwnerInfo.getId(),userElement.getCommunityId());
 			if (null == tpBillInvoice){
 				throw new Exception("订单不存在");
 			}else if (!tpBillInvoice.getBillStatus().equals("0")){
@@ -226,15 +263,16 @@ public class WxPayServiceImpl implements WxPayServiceI {
 			tpBillOrder.setUpdateUser(userElement.getId());
 			tpBillOrder.setOrderBumber(orderNo);
 
-			billOrderList.add(tpBillOrder);
-		}
+			tpBillOrderMapper.insertSelective(tpBillOrder);
 
+			// billOrderList.add(tpBillOrder);
+		}
 
-		//更新为正在支付状态
-		updateBillInvoiceBillStatus(billInvoiceIdArray, taUser.getUserName(),"3");
+		// 修改缴费人
+		// updateBillInvoiceBillStatus(billInvoiceIdArray, user.getUserName(), "1");
 
 		// 生成缴费订单
-		tpBillOrderMapper.batchInsertSelective(billOrderList);
+		// tpBillOrderMapper.batchInsertSelective(billOrderList);
 
 		return orderNo;
 	}
@@ -283,6 +321,14 @@ public class WxPayServiceImpl implements WxPayServiceI {
 
 		//更新为正在支付状态
 		updateBillInvoiceBillStatus(billInvoiceIdList,"0");
+		log.info("订单: {}， 状态变更为取消支付", outTradeNo);
+
+		// 更改订单状态 为支付成功
+		List<TpBillOrder> billOrders = tpBillOrderMapper.selectByOrderBumber(outTradeNo);
+		billOrders.forEach(e-> {
+			e.setOrderStatus("0");
+			tpBillOrderMapper.updateByPrimaryKeySelective(e);
+		});
 	}
 	
 	/**

CODE/smart-community/app-api/src/main/resources/application.yml

@@ -32,11 +32,11 @@ welcome:
 # 登陆的状态跳转url配置
 login-code-perproties:
   login-code:
-    1000: url # 无关联房产
-    1001: url # 关联一个审核通过的房产
-    1002: url # 关联一个待审核房产
-    1003: url # 关联一个审核未通过房产
-    1004: url  # 有多个关联房产
-    1005: url # 该房产，暂无审核通过的业主！
-    1006: url # 无关联账号!
-    1007: url # 未注册!
+    1000: /linkBuilding?from=index # 无关联房产
+    1001: index  # 关联一个审核通过的房产
+    1002: /linkBuildingState?from=index # 关联一个待审核房产
+    1003: /linkBuildingState?from=index # 关联一个审核未通过房产
+    1004:    # 有多个关联房产
+    1005:    # 该房产，暂无审核通过的业主！关联房产的时候，验证是否可以选择业主进行绑定
+    1006: /linkWeChat?from=index # 无关联账号!社交授权登录的时候
+    1007: /register?from=index # 未注册!社交授权登录 关联手机号账号未注册

CODE/smart-community/app-api/src/main/resources/mapper/TpBillOrderMapper.xml

@@ -11,10 +11,11 @@
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+    <result column="order_status" property="orderStatus" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, community_id, tp_bill_id, tp_bill_invoice_id, order_bumber, create_user, create_date, 
-    update_user, update_date
+    update_user, update_date, order_status
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -29,11 +30,12 @@
   <insert id="insert" parameterType="com.community.huiju.model.TpBillOrder" >
     insert into tp_bill_order (id, community_id, tp_bill_id, 
       tp_bill_invoice_id, order_bumber, create_user, 
-      create_date, update_user, update_date
+      create_date, update_user, update_date, order_status
       )
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{tpBillId,jdbcType=INTEGER}, 
       #{tpBillInvoiceId,jdbcType=INTEGER}, #{orderBumber,jdbcType=VARCHAR}, #{createUser,jdbcType=INTEGER}, 
-      #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}
+      #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP},
+      #{orderStatus,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TpBillOrder" >
@@ -66,6 +68,9 @@
       <if test="updateDate != null" >
         update_date,
       </if>
+      <if test="orderStatus != null">
+        order_status,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -95,6 +100,9 @@
       <if test="updateDate != null" >
         #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="orderStatus != null">
+        #{orderStatus,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpBillOrder" >
@@ -124,6 +132,9 @@
       <if test="updateDate != null" >
         update_date = #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="orderStatus != null">
+        order_status = #{orderStatus,jdbcType=VARCHAR}
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -136,7 +147,8 @@
       create_user = #{createUser,jdbcType=INTEGER},
       create_date = #{createDate,jdbcType=TIMESTAMP},
       update_user = #{updateUser,jdbcType=INTEGER},
-      update_date = #{updateDate,jdbcType=TIMESTAMP}
+      update_date = #{updateDate,jdbcType=TIMESTAMP},
+      order_status = #{orderStatus,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
@@ -172,6 +184,9 @@
         <if test="item.updateDate != null" >
           #{item.updateDate,jdbcType=TIMESTAMP},
         </if>
+        <if test="orderStatus != null">
+          order_status = #{orderStatus,jdbcType=VARCHAR},
+        </if>
       </trim>
     </foreach>
   </insert>

CODE/smart-community/community-common/src/main/java/com/community/commom/mode/ResponseBean.java

@@ -18,6 +18,8 @@ public class ResponseBean<T> implements Serializable {
 
     private T data;
 
+    private String url;
+
     public ResponseBean() {
     }
 
@@ -31,9 +33,10 @@ public class ResponseBean<T> implements Serializable {
         this.message = message;
     }
 
-    public void addError(String code, String message) {
-        this.code = code;
+    public void addError(String message, String url) {
+        this.code = "1";
         this.message = message;
+        this.url = url;
     }
 
     public void addSuccess(String message) {
@@ -53,6 +56,13 @@ public class ResponseBean<T> implements Serializable {
         this.data = data;
     }
 
+    public void addSuccess(String message, T data, String url) {
+        this.code = "0";
+        this.message = message;
+        this.data = data;
+        this.url = url;
+    }
+
     public void addSuccess(T data) {
         this.code = "0";
         this.message = "成功";
@@ -73,6 +83,14 @@ public class ResponseBean<T> implements Serializable {
 
     @Override
     public String toString() {
-        return "ResponseBaseBean [code=" + this.code + ", message=" + this.message + ", data=" + this.data + "]";
+        return "ResponseBaseBean [code=" + this.code + ", message=" + this.message + ", data=" + this.data + ", url=" + url + "]";
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
     }
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivityServiceImpl.java

@@ -237,7 +237,7 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
 
                 if (radio==1){
                     try {
-                       InputStream inputStream= QRCode.encode(tpActivity.getId()+"");
+                       InputStream inputStream= QRCode.encode(qrCodePerproties.getUrl(),tpActivity.getId()+"");
                         String codeUrl= imageServiceI.getImageUrl(inputStream);
                         TdImages tdImages= new TdImages();
                         tdImages.setImageUrl(codeUrl);

VUECODE/smart-property-manage/src/api/billInvoice.js

@@ -67,10 +67,10 @@ export function addTempBillInvoice(data) {
     method: 'post',
     data: {
       billId: data.billId, //  收费项id
-      phase: data.phase, // 期/区
-      building: data.building, // 栋
-      unit: data.unit, // 单元
-      roomNo: data.roomNo, // 户号
+      phase: data.phaseId, // 期/区
+      building: data.buildingId, // 栋
+      unit: data.unitId, // 单元
+      roomNo: data.roomNoId, // 户号
       worthOf: data.worthOf, // 催缴日期
       billInvoiceExplain: data.billInvoiceExplain, // 收费单说明
       payPrice: data.payPrice // 收费金额

VUECODE/smart-property-manage/src/router/index.js

@@ -49,6 +49,13 @@ export const constantRouterMap = [
         name: 'building-index',
         meta: { title: '楼栋业主资料库', icon: 'building' }
       },
+      {
+        path: '/building/info/index',
+        component: () => import('@/views/building/info/index'),
+        name: 'building-info-index',
+        hidden: true,
+        meta: { title: '楼栋业主资料库详情', icon: 'building' }
+      },
       {
         path: '/building/buildingdata/edibuildingdata',
         component: () => import('@/views/building/buildingdata/edibuildingdata'),

VUECODE/smart-property-manage/src/views/bill/info/add/index.vue

@@ -2,33 +2,41 @@
   <div id="root">
     <el-form :model="formInline" inline="true" class="demo-form-inline">
       <el-form-item label="选择房子">
-        <el-select v-model="formInline.phase" placeholder="请选择期" @change="buildSelectChange(0)">
+        <el-select v-model="formInline.phaseId" placeholder="请选择期" @change="buildSelectChange(0)">
           <el-option
             v-for="item in phaseList"
             :key="item.id"
-            :label="item.phase"
-            :value="item.phase"/>
+            :label="item.name"
+            :value="item.id"/>
         </el-select>
-        <el-select v-model="formInline.building" placeholder="请选择栋" @change="buildSelectChange(1)">
+        <el-select v-model="formInline.buildingId" placeholder="请选择栋" @change="buildSelectChange(1)">
           <el-option
             v-for="item in buildingList"
             :key="item.id"
-            :label="item.building"
-            :value="item.building"/>
+            :label="item.name"
+            :value="item.id"/>
         </el-select>
-        <el-select v-model="formInline.unit" placeholder="请选择单元" @change="buildSelectChange(3)">
+        <el-select v-model="formInline.unitId" placeholder="请选择单元" @change="buildSelectChange(2)">
           <el-option
             v-for="item in unitList"
             :key="item.id"
-            :label="item.unit"
-            :value="item.unit"/>
+            :label="item.name"
+            :value="item.id"/>
         </el-select>
-        <el-select v-model="formInline.roomNo" placeholder="请选择户">
+        <el-select v-model="formInline.levelId" placeholder="楼层" @change="buildSelectChange(3)">
+          <!--<el-option label="选择楼层" value="-1" />-->
+          <el-option
+            v-for="item in levelList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"/>
+        </el-select>
+        <el-select v-model="formInline.roomNoId" placeholder="请选择户">
           <el-option
             v-for="item in roomNoList"
             :key="item.id"
-            :label="item.roomNo"
-            :value="item.roomNo"/>
+            :label="item.name"
+            :value="item.id"/>
         </el-select>
       </el-form-item>
       <br>
@@ -95,10 +103,11 @@ export default {
     return {
       formInline: {
         billId: '', //  收费项id
-        phase: '', // 期/区
-        building: '', // 栋
-        unit: '', // 单元
-        roomNo: '', // 户号
+        phaseId: '',
+        buildingId: '',
+        unitId: '',
+        levelId: '',
+        roomNoId: '',
         worthOf: '', // 催缴日期
         billInvoiceExplain: '', // 收费单说明
         payPrice: '' // 收费金额
@@ -198,40 +207,40 @@ export default {
       })
     },
     getPhase() { // 获取期
-      this.formInline.phase = ''
-      this.$store.dispatch('BuildingAddress', this.formInline).then((res) => {
+      this.formInline.phaseId = ''
+      this.$store.dispatch('GetPhaseList', this.formInline).then((res) => {
         this.phaseList = res.data
       }).catch(() => {
         console.log('error phase BuildingAddress')
       })
     },
     getBuild() { // 获取楼栋
-      this.formInline.building = ''
-      this.$store.dispatch('BuildingAddress', this.formInline).then((res) => {
+      this.formInline.buildingId = ''
+      this.$store.dispatch('GetBuildingList', this.formInline).then((res) => {
         this.buildingList = res.data
       }).catch(() => {
         console.log('error building BuildingAddress')
       })
     },
     getUnit() { // 获取单元
-      this.formInline.unit = ''
-      this.$store.dispatch('BuildingAddress', this.formInline).then((res) => {
+      this.formInline.unitId = ''
+      this.$store.dispatch('GetUnitList', this.formInline).then((res) => {
         this.unitList = res.data
       }).catch(() => {
         console.log('error unit BuildingAddress')
       })
     },
     getLevel() { // 获取楼层
-      this.formInline.level = ''
-      this.$store.dispatch('BuildingAddress', this.formInline).then((res) => {
+      this.formInline.levelId = ''
+      this.$store.dispatch('GetLevelList', this.formInline).then((res) => {
         this.levelList = res.data
       }).catch(() => {
         console.log('error level BuildingAddress')
       })
     },
     getRoomNo() { // 获取户号
-      this.formInline.roomNo = ''
-      this.$store.dispatch('BuildingAddress', this.formInline).then((res) => {
+      this.formInline.roomNoId = ''
+      this.$store.dispatch('GetRoomNoList', this.formInline).then((res) => {
         this.roomNoList = res.data
       }).catch(() => {
         console.log('error roomNo BuildingAddress')
@@ -244,31 +253,31 @@ export default {
           this.unitList = []
           this.levelList = []
           this.roomNoList = []
-          this.formInline.building = ''
-          this.formInline.unit = ''
-          this.formInline.level = ''
-          this.formInline.roomNo = ''
+          this.formInline.buildingId = ''
+          this.formInline.unitId = ''
+          this.formInline.levelId = ''
+          this.formInline.roomNoId = ''
           this.getBuild()
           break
         case 1: // 查询 单元
           this.unitList = []
           this.levelList = []
           this.roomNoList = []
-          this.formInline.unit = ''
-          this.formInline.level = ''
-          this.formInline.roomNo = ''
+          this.formInline.unitId = ''
+          this.formInline.levelId = ''
+          this.formInline.roomNoId = ''
           this.getUnit()
           break
         case 2: // 查询 楼层
           this.levelList = []
           this.roomNoList = []
-          this.formInline.level = ''
-          this.formInline.roomNo = ''
+          this.formInline.levelId = ''
+          this.formInline.roomNoId = ''
           this.getLevel()
           break
         case 3: // 查询 户号
           this.roomNoList = []
-          this.formInline.roomNo = ''
+          this.formInline.roomNoId = ''
           this.getRoomNo()
           break
       }

VUECODE/smart-property-manage/src/views/bill/info/index.vue

@@ -10,33 +10,41 @@
       <span style="font-weight: bold;">收费情况</span>
       <el-form :model="formInline" inline="true" class="form-inline">
         <el-form-item label="选择房子">
-          <el-select v-model="formInline.phase" placeholder="请选择期" @change="buildSelectChange(0)">
+          <el-select v-model="formInline.phaseId" placeholder="请选择期" @change="buildSelectChange(0)">
             <el-option
               v-for="item in phaseList"
               :key="item.id"
-              :label="item.phase"
-              :value="item.phase"/>
+              :label="item.name"
+              :value="item.id"/>
           </el-select>
-          <el-select v-model="formInline.building" placeholder="请选择栋" @change="buildSelectChange(1)">
+          <el-select v-model="formInline.buildingId" placeholder="请选择栋" @change="buildSelectChange(1)">
             <el-option
               v-for="item in buildingList"
               :key="item.id"
-              :label="item.building"
-              :value="item.building"/>
+              :label="item.name"
+              :value="item.id"/>
           </el-select>
-          <el-select v-model="formInline.unit" placeholder="请选择单元" @change="buildSelectChange(3)">
+          <el-select v-model="formInline.unitId" placeholder="请选择单元" @change="buildSelectChange(2)">
             <el-option
               v-for="item in unitList"
               :key="item.id"
-              :label="item.unit"
-              :value="item.unit"/>
+              :label="item.name"
+              :value="item.id"/>
           </el-select>
-          <el-select v-model="formInline.roomNo" placeholder="请选择户">
+          <el-select v-model="formInline.levelId" placeholder="请选择楼层" @change="buildSelectChange(3)">
+            <!--<el-option label="选择楼层" value="-1" />-->
+            <el-option
+              v-for="item in levelList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"/>
+          </el-select>
+          <el-select v-model="formInline.roomNoId" placeholder="请选择户">
             <el-option
               v-for="item in roomNoList"
               :key="item.id"
-              :label="item.roomNo"
-              :value="item.roomNo"/>
+              :label="item.name"
+              :value="item.id"/>
           </el-select>
         </el-form-item>
         <br>
@@ -191,10 +199,11 @@ export default {
     return {
       formInline: {
         billId: '', // 缴费项目id
-        phase: '',
-        building: '',
-        unit: '',
-        roomNo: '',
+        phaseId: '',
+        buildingId: '',
+        unitId: '',
+        levelId: '',
+        roomNoId: '',
         ownerName: '',
         billStatus: '',
         payName: '',
@@ -230,10 +239,10 @@ export default {
       }
     },
     cleanQuery() { // 清空
-      this.formInline.phase = ''
-      this.formInline.building = ''
-      this.formInline.unit = ''
-      this.formInline.roomNo = ''
+      this.formInline.phaseId = ''
+      this.formInline.buildingId = ''
+      this.formInline.unitId = ''
+      this.formInline.roomNoId = ''
       this.formInline.ownerName = ''
       this.formInline.billStatus = ''
       this.formInline.payName = ''
@@ -257,40 +266,40 @@ export default {
       })
     },
     getPhase() { // 获取期
-      this.formInline.phase = ''
-      this.$store.dispatch('BuildingAddress', this.formInline).then((res) => {
+      this.formInline.phaseId = ''
+      this.$store.dispatch('GetPhaseList', this.formInline).then((res) => {
         this.phaseList = res.data
       }).catch(() => {
         console.log('error phase BuildingAddress')
       })
     },
     getBuild() { // 获取楼栋
-      this.formInline.building = ''
-      this.$store.dispatch('BuildingAddress', this.formInline).then((res) => {
+      this.formInline.buildingId = ''
+      this.$store.dispatch('GetBuildingList', this.formInline).then((res) => {
         this.buildingList = res.data
       }).catch(() => {
         console.log('error building BuildingAddress')
       })
     },
     getUnit() { // 获取单元
-      this.formInline.unit = ''
-      this.$store.dispatch('BuildingAddress', this.formInline).then((res) => {
+      this.formInline.unitId = ''
+      this.$store.dispatch('GetUnitList', this.formInline).then((res) => {
         this.unitList = res.data
       }).catch(() => {
         console.log('error unit BuildingAddress')
       })
     },
     getLevel() { // 获取楼层
-      this.formInline.level = ''
-      this.$store.dispatch('BuildingAddress', this.formInline).then((res) => {
+      this.formInline.levelId = ''
+      this.$store.dispatch('GetLevelList', this.formInline).then((res) => {
         this.levelList = res.data
       }).catch(() => {
         console.log('error level BuildingAddress')
       })
     },
     getRoomNo() { // 获取户号
-      this.formInline.roomNo = ''
-      this.$store.dispatch('BuildingAddress', this.formInline).then((res) => {
+      this.formInline.roomNoId = ''
+      this.$store.dispatch('GetRoomNoList', this.formInline).then((res) => {
         this.roomNoList = res.data
       }).catch(() => {
         console.log('error roomNo BuildingAddress')
@@ -303,31 +312,31 @@ export default {
           this.unitList = []
           this.levelList = []
           this.roomNoList = []
-          this.formInline.building = ''
-          this.formInline.unit = ''
-          this.formInline.level = ''
-          this.formInline.roomNo = ''
+          this.formInline.buildingId = ''
+          this.formInline.unitId = ''
+          this.formInline.levelId = ''
+          this.formInline.roomNoId = ''
           this.getBuild()
           break
         case 1: // 查询 单元
           this.unitList = []
           this.levelList = []
           this.roomNoList = []
-          this.formInline.unit = ''
-          this.formInline.level = ''
-          this.formInline.roomNo = ''
+          this.formInline.unitId = ''
+          this.formInline.levelId = ''
+          this.formInline.roomNoId = ''
           this.getUnit()
           break
         case 2: // 查询 楼层
           this.levelList = []
           this.roomNoList = []
-          this.formInline.level = ''
-          this.formInline.roomNo = ''
+          this.formInline.levelId = ''
+          this.formInline.roomNoId = ''
           this.getLevel()
           break
         case 3: // 查询 户号
           this.roomNoList = []
-          this.formInline.roomNo = ''
+          this.formInline.roomNoId = ''
           this.getRoomNo()
           break
       }

VUECODE/smart-property-manage/src/views/building/edi/index.vue

@@ -21,7 +21,7 @@
         <el-radio v-model="listQuery.verifyStatus" label="true">通过</el-radio>
         <el-radio v-model="listQuery.verifyStatus" label="false">不通过</el-radio>
       </el-form-item>
-      <el-form-item v-if="listQuery.verifyStatus === false" label="不通过的原因">
+      <el-form-item v-if="listQuery.verifyStatus === 'false'" label="不通过的原因">
         <el-radio v-model="listQuery.remark" label="不认识的人的手机号">不认识的人的手机号</el-radio>
         <el-radio v-model="listQuery.remark" label="其他原因需要沟通">其他原因需要沟通</el-radio>
       </el-form-item>
@@ -39,7 +39,7 @@
           <span style="margin-left: 100px;">{{ idCard }}</span>
         </el-form-item>
       </div>
-      <el-form-item>
+      <el-form-item v-if="button_bol">
         <el-button type="primary" @click="submitForm('ruleForm')">确定</el-button>
         <el-button @click="resetForm('ruleForm')">重置</el-button>
       </el-form-item>
@@ -57,6 +57,7 @@ export default {
         roleId: '',
         remark: ''
       },
+      button_bol: true, // 是否显示 确定和重置 按钮
       isRegistered: true, // true 未注册 false 注册
       roleDisabled: false, // 是否禁用业主下拉选项
       phaseList: [], // 期 集合
@@ -129,6 +130,13 @@ export default {
           // 表示已经是业主
           this.roleDisabled = true
         }
+
+        // 审核状态
+        const resVerify = resData.verify
+        const verifyStatus = resVerify.verifyStatus
+        this.listQuery.verifyStatus = verifyStatus === '1' ? 'true' : verifyStatus === '0' ? '' : 'false'
+        this.listQuery.roleId = resVerify.roleId + ''
+        this.button_bol = verifyStatus === '0' ? true : false
       }).catch(() => {
         console.log('GetByIdBuildingId error')
       })

VUECODE/smart-property-manage/src/views/building/index.vue

@@ -307,7 +307,7 @@ export default {
       this.dataQuery()
     },
     clickTitle(id) {
-      alert(id)
+      this.$router.push({ name: 'building-info-index', query: { id: id }})
     },
     deleteData() { // 删除
       this.$confirm('您确定要删除吗?')
@@ -342,14 +342,14 @@ export default {
         return
       }
       this.$store.dispatch('GetByIdBuildingId', ids[0]).then((res) => {
-        const resCode = res.code
-        if (resCode === '0') {
-          const resData = res.data
-          if (resData.verifyStatus === '1') {
-            this.$message.error('不能修改已认证的楼栋业主信息!')
-            return
-          }
-        }
+        // const resCode = res.code
+        // if (resCode === '0') {
+        //   const resData = res.data
+        //   if (resData.verify.verifyStatus !== '0') {
+        //     this.$message.error('不能修改已审核的资料信息!')
+        //     return
+        //   }
+        // }
         this.$router.push({ name: 'building-edi', query: { id: ids[0], listQuery: this.listQuery }})
       }).catch(() => {
         console.log('error GetByIdBuildingId')

VUECODE/smart-property-manage/src/views/building/info/index.vue

@@ -0,0 +1,51 @@
+<template>
+  <div id="root">
+    <div class="form-div">
+      <el-form ref="form" label-width="150px" label-position="left">
+        <el-form-item label="基本信息"/>
+        <el-form-item>
+          <table>
+            <tr>
+              <td>姓名</td>
+              <td>张三</td>
+              <td>性别</td>
+              <td>男</td>
+              <td>手机号</td>
+              <td>15871301059</td>
+            </tr>
+            <tr>
+              <td>微信昵称</td>
+              <td>张三</td>
+              <td>微信ID</td>
+              <td>男</td>
+              <td>身份证</td>
+              <td>15871301059</td>
+            </tr>
+            <tr>
+              <td>头像</td>
+              <td colspan="5">张三</td>
+            </tr>
+          </table>
+        </el-form-item>
+        <el-form-item label="在当前房屋"/>
+        <el-form-item label="关联本小区其他房屋"/>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'InfoIndex'
+}
+</script>
+
+<style scoped>
+table tr td {
+  padding-right: 50px;
+}
+.form-div {
+  display: flex;
+  justify-content: center;
+}
+</style>