合

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

@@ -59,13 +59,13 @@ public class AliPayController {
 	@ApiOperation(value = "统一下单", notes = "统一下单")
 	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "Integer", name = "billInvoiceId", value = "账单Id"),
 			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token") })
-	@RequestMapping(value = "/aliPayOrder/{billInvoiceId}",method = RequestMethod.GET)
-	public ResponseBean wxUnifiedOrder(@PathVariable("billInvoiceId") Integer billInvoiceId, HttpSession session){
+	@RequestMapping(value = "/aliPayOrder/{outTradeNo}",method = RequestMethod.GET)
+	public ResponseBean wxUnifiedOrder(@PathVariable("outTradeNo") String outTradeNo, HttpSession session){
 		ResponseBean responseBean = new ResponseBean();
 		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
 		String resp = "";
 		try {
-			resp = aliPayService.AliPayOrder(billInvoiceId,userElement);
+			resp = aliPayService.AliPayOrder(outTradeNo,userElement);
 		} catch (Exception e) {
 			e.printStackTrace();
 			responseBean.addError(e.getMessage());

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

@@ -65,4 +65,13 @@ public class BaseController {
         return userElement;
     }
 
+    /**
+     * 删除 用户 session
+     * @param session
+     */
+    protected void removeUserElement(HttpSession session) {
+        log.info("用户当前sessionId：{}", session.getId());
+        session.removeAttribute(Constant.APP_USER_SESSION);
+    }
+
 }

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

@@ -40,13 +40,12 @@ public class BillController extends BaseController {
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
 			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
 	})
-	@RequestMapping(value = "/bills/{communityId}/{payType}",method = RequestMethod.GET)
+	@RequestMapping(value = "/bills/current_user/{payType}",method = RequestMethod.GET)
 	public ResponseBean getBillInvoice(@PathVariable Integer communityId,
 									   @PathVariable Integer payType,
 									   @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 									   @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize, HttpSession session){
-		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-		Integer userId = userElement.getId();
+		UserElement userElement = getUserElement(session);
 		ResponseBean responseBean = new ResponseBean();
 
 		if (!check(communityId)) {
@@ -54,7 +53,7 @@ public class BillController extends BaseController {
 			return responseBean;
 		}
 
-		Map<String, Object> map = billServiceI.getBillsList(communityId, payType, userId, pageNum, pageSize);
+		Map<String, Object> map = billServiceI.getBillsList(userElement, payType, pageNum, pageSize);
 		responseBean.addSuccess(map);
 		return responseBean;
 	}

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

@@ -32,30 +32,28 @@ public class IBuildingOwnerInfoController extends BaseController {
     private IBuildingOwnerInfo iBuildingOwnerInfo;
 
     @RequestMapping(value = "/building/select/address", method = RequestMethod.GET)
-    @ApiOperation(value = "根据 小区/期/楼栋/单元/楼层/户号", notes = "根据 小区/期/楼栋/单元/楼层/户号")
+    @ApiOperation(value = "根据 小区/期/楼栋/单元/楼层/户号 (申请注册绑定)", notes = "根据 小区/期/楼栋/单元/楼层/户号")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "communityId", value = "小区"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "phaseId", value = "期"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "buildingId", value = "楼栋"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "unitId", value = "单元"),
-            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "levelId", value = "楼层"),
-            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "roomNoId", value = "户号"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "levelId", value = "楼层")
     })
     public ResponseBean selectByAddress(@RequestParam("communityId") Integer communityId,
                                         @RequestParam(value = "phaseId", required = false) Integer phaseId,
                                         @RequestParam(value = "buildingId",required = false) Integer buildingId,
                                         @RequestParam(value = "unitId", required = false) Integer unitId,
-                                        @RequestParam(value = "levelId", required = false) Integer levelId,
-                                        @RequestParam(value = "roomNoId", required = false) Integer roomNoId) {
+                                        @RequestParam(value = "levelId", required = false) Integer levelId) {
 
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iBuildingOwnerInfo.selectBuildList(communityId, phaseId, buildingId, unitId, levelId, roomNoId);
+        responseBean = iBuildingOwnerInfo.selectBuildList(communityId, phaseId, buildingId, unitId, levelId);
         return responseBean;
 
     }
 
     @RequestMapping(value = "/building/has", method = RequestMethod.GET)
-    @ApiOperation(value = "根据 小区、期、楼栋、单元、楼层、户号", notes = "根据 小区、期、楼栋、单元、楼层、户号")
+    @ApiOperation(value = "根据 小区、期、楼栋、单元、楼层、户号 （并校验这个用户，是否绑定了这个房产）", notes = "根据 小区、期、楼栋、单元、楼层、户号")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "phaseId", value = "期"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "buildingId", value = "楼栋"),

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

@@ -87,15 +87,14 @@ public class UserController extends BaseController {
 
     @ApiOperation(value = "修改手机号", notes = "修改手机号")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body",dataType = "String",name = "paramets",value = "phone：登陆(手机号)，code：(手机验证码),otherUserId:(租客或者家属ID，空为业主本人)"),
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "paramets",value = "phone：登陆(手机号)，code：(手机验证码)"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
             @RequestMapping(value = "/user/phone",method = RequestMethod.PUT)
     public ResponseBean update(@RequestBody String paramets, HttpSession session){
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId=userElement.getId();
-        ResponseBean response=iTaUserService.upDateloginName(userId,paramets,userElement.getCommunityId());
+        UserElement userElement = getUserElement(session);
+        ResponseBean response=iTaUserService.updateLoginName(userElement, paramets);
         return response;
     }
 
@@ -120,13 +119,8 @@ public class UserController extends BaseController {
     public ResponseBean updateUserNameAndGender(@RequestBody String parameter,
                                                 HttpSession session){
         ResponseBean response = new ResponseBean();
-
-        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-
-        TaUser user = JSONObject.parseObject(parameter,TaUser.class);
-        user.setId(userElement.getId());
-
-        response = iTaUserService.modifyUser(user);
+        UserElement userElement = getUserElement(session);
+        response = iTaUserService.modifyUser(userElement, parameter);
         return response;
 
     }
@@ -231,6 +225,11 @@ public class UserController extends BaseController {
         ResponseBean response = new ResponseBean();
         UserElement userElement = getUserElement(session);
         response = iTaUserService.getUserInfo(userElement,userId);
+        if ("1".equals(response.getCode())) {
+            // 清空 session
+            removeUserElement(session);
+            return response;
+        }
         TaUserVO userVO = (TaUserVO) response.getData();
         userVO.setToken(session.getId());
 
@@ -244,6 +243,7 @@ public class UserController extends BaseController {
             @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "communityId", value = "小区Id"),
     })
     @RequestMapping(value = "/user/temporary/{communityId}", method = RequestMethod.POST)
+    @Deprecated
     public ResponseBean temporaryLogin(@PathVariable Integer communityId, HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
         responseBean = iTaUserService.temporaryLogin(communityId);

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

@@ -42,7 +42,7 @@ public class UserVerifyController extends BaseController {
     @ApiOperation(value = "添加一个审核的房产", notes = "添加一个审核的房产")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
-            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "roleName角色名称;phase期;building楼栋;unit单元;level楼层;roomNo户号")
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "roleName角色名称;phaseId期;buildingId楼栋;unitId单元;levelId楼层;roomNoId户号")
     })
     public ResponseBean addUserVerify(@RequestBody String parameter, HttpSession session) {
         ResponseBean responseBean = new ResponseBean();

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

@@ -30,6 +30,7 @@ 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;
 
 /**
@@ -49,14 +50,14 @@ 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") })
-	@RequestMapping(value = "/wxUnifiedOrder/{billInvoiceId}",method = RequestMethod.GET)
-	public ResponseBean wxUnifiedOrder(@PathVariable("billInvoiceId") Integer billInvoiceId, HttpSession session){
+	@RequestMapping(value = "/wxUnifiedOrder/{outTradeNo}",method = RequestMethod.GET)
+	public ResponseBean wxUnifiedOrder(@PathVariable("outTradeNo") String outTradeNo, HttpSession session){
 		ResponseBean responseBean = new ResponseBean();
 		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
 		
 		Map<String, String> resp = Maps.newHashMap();
 		try {
-			resp = wxPayService.wxUnifiedOrder(billInvoiceId,userElement);
+			resp = wxPayService.wxUnifiedOrder(outTradeNo,userElement);
 		} catch (Exception e) {
 			e.printStackTrace();
 			responseBean.addError(e.getMessage());
@@ -132,12 +133,16 @@ 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") })
-	@RequestMapping(value = "/wxStartPay/{billInvoiceId}",method = RequestMethod.POST)
-	public ResponseBean wxStartPay(@PathVariable("billInvoiceId") Integer billInvoiceId, HttpSession session){
+	@RequestMapping(value = "/wxStartPay",method = RequestMethod.POST)
+	public ResponseBean wxStartPay(List<Integer> billInvoiceIdList, HttpSession session){
 		ResponseBean responseBean = new ResponseBean();
 		try {
 			UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-			wxPayService.wxStartPay(billInvoiceId,userElement);
+			String outTradeNo = wxPayService.wxStartPay(billInvoiceIdList, userElement);
+
+			Map<String,Object> resultMap = Maps.newHashMap();
+			resultMap.put("outTradeNo", outTradeNo);
+			responseBean.addSuccess(resultMap);
 		} catch (Exception e) {
 			e.printStackTrace();
 			responseBean.addError(e.getMessage());
@@ -149,12 +154,12 @@ 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") })
-	@RequestMapping(value = "/wxCancelPay/{billInvoiceId}",method = RequestMethod.POST)
-	public ResponseBean wxCancelPay(@PathVariable("billInvoiceId") Integer billInvoiceId, HttpSession session){
+	@RequestMapping(value = "/wxCancelPay/{outTradeNo}",method = RequestMethod.POST)
+	public ResponseBean wxCancelPay(@PathVariable("outTradeNo") String outTradeNo, HttpSession session){
 		ResponseBean responseBean = new ResponseBean();
 		try {
 			UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-			wxPayService.wxCancelPay(billInvoiceId,userElement);
+			wxPayService.wxCancelPay(outTradeNo,userElement);
 		} catch (Exception e) {
 			e.printStackTrace();
 			responseBean.addError(e.getMessage());

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpBillInvoiceMapper.java

@@ -24,11 +24,11 @@ public interface TpBillInvoiceMapper {
     /**
      * 分页获取缴费和未缴费的数据
      * @param communityId
-     * @param userId
+     * @param buildingOwnerInfoId
      * @param payType
      * @return
      */
-    List<Map<String, Object>> getBillsList(@Param("communityId") Integer communityId,@Param("userId") Integer userId,@Param("payType") Integer payType);
+    List<Map<String, Object>> getBillsList(@Param("communityId") Integer communityId,@Param("buildingOwnerInfoId") Integer buildingOwnerInfoId,@Param("payType") Integer payType);
     
     /**
      * 获取账单的详细信息
@@ -40,11 +40,11 @@ public interface TpBillInvoiceMapper {
     /**
      * 获取需要支付的金额
      * @param billInvoiceId
-     * @param userId
+     * @param buildingOwnerInfoId
      * @param communityId
      * @return
      */
-	TpBillInvoice selectByIdAndUserId(@Param("id") Integer billInvoiceId,@Param("userId") Integer userId,@Param("communityId") Integer communityId);
+	TpBillInvoice selectByIdAndBuildingOwnerInfoId(@Param("id") Integer billInvoiceId,@Param("buildingOwnerInfoId") Integer buildingOwnerInfoId,@Param("communityId") Integer communityId);
     
     TpBillInvoice selectByOutTradeNo(@Param("outTradeNo") String outTradeNo);
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpBillOrderMapper.java

@@ -0,0 +1,35 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpBillOrder;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface TpBillOrderMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpBillOrder record);
+
+    int insertSelective(TpBillOrder record);
+
+    TpBillOrder selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpBillOrder record);
+
+    int updateByPrimaryKey(TpBillOrder record);
+
+    /**
+     * 批量插入
+     * @param list
+     * @return
+     */
+    int batchInsertSelective(List<TpBillOrder> list);
+
+    @ResultMap("BaseResultMap")
+    @Select("select * from tp_bill_order where order_bumber=#{orderNumber}")
+    List<TpBillOrder> selectByOrderBumber(@Param("orderNumber") String orderNumber);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpBuildingMapper.java

@@ -3,6 +3,9 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.TpBuilding;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -20,6 +23,14 @@ public interface TpBuildingMapper {
 
     int updateByPrimaryKey(TpBuilding record);
 
-
+    /**
+     * 根据小区id，期id
+     * @param communityId
+     * @param phaseId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from tp_building where community_id=#{communityId} and phase_id=#{phaseId}")
+    List<TpBuilding> selectByAddress(@Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId);
 
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpBuildingOwnerInfoMapper.java

@@ -44,9 +44,26 @@ public interface TpBuildingOwnerInfoMapper {
     @ResultMap("BaseResultMap")
     @Select("select * from tp_building_owner_info where community_id=#{communityId}" +
             " and phase_id=#{phaseId} and building_id=#{buildingId} and unit_id=#{unitId}" +
-            " and level_id=#{levelId} and room_no_id=#{roomNoId} and verify_status=1")
+            " and level_id=#{levelId} and id=#{roomNoId} and verify_status=1")
     TpBuildingOwnerInfo selectCommunityIdAndAddress(@Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId,
                                                     @Param("buildingId") Integer building, @Param("unitId") Integer unitId,
                                                     @Param("levelId") Integer level, @Param("roomNoId") Integer roomNoId);
 
+    /*
+     * 根据 小区，期，楼栋，单元，楼层
+     * @param communityId
+     * @param phase
+     * @param building
+     * @param unit
+     * @param level
+     * @param roomNo
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from tp_building_owner_info where community_id=#{communityId}" +
+            " and phase_id=#{phaseId} and building_id=#{buildingId} and unit_id=#{unitId}" +
+            " and level_id=#{levelId} and verify_status=1")
+    List<TpBuildingOwnerInfo> selectByAddress(@Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId,
+                                                    @Param("buildingId") Integer building, @Param("unitId") Integer unitId,
+                                                    @Param("levelId") Integer level);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpLevelMapper.java

@@ -0,0 +1,35 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpLevel;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface TpLevelMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpLevel record);
+
+    int insertSelective(TpLevel record);
+
+    TpLevel selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpLevel record);
+
+    int updateByPrimaryKey(TpLevel record);
+
+    /**
+     * 根据 小区id，期id，楼栋id，单元id 进行查询
+     * @param communityId
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from tp_level where community_id=#{communityId} and phase_id=#{phaseId} and building_id=#{buildingId} and unit_id=#{unitId}")
+    List<TpLevel> selectByAddress(Integer communityId, Integer phaseId, Integer buildingId, Integer unitId);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpPhaseMapper.java

@@ -0,0 +1,33 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpPhase;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface TpPhaseMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpPhase record);
+
+    int insertSelective(TpPhase record);
+
+    TpPhase selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpPhase record);
+
+    int updateByPrimaryKey(TpPhase record);
+
+    /**
+     * 根据小区查询 期
+     * @param communityId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from tp_phase where community_id = #{communityId}")
+    List<TpPhase> selectByAddress(@Param("communityId") Integer communityId);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpUnitMapper.java

@@ -0,0 +1,34 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpUnit;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface TpUnitMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpUnit record);
+
+    int insertSelective(TpUnit record);
+
+    TpUnit selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpUnit record);
+
+    int updateByPrimaryKey(TpUnit record);
+
+    /**
+     * 根据 小区id，期id，楼栋id 查询
+     * @param communityId
+     * @param phaseId
+     * @param buildingId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from tp_unit where community_id=#{communityId} and phase_id=#{phaseId} and building_id=#{buildingId}")
+    List<TpUnit> selectByAddress(Integer communityId, Integer phaseId, Integer buildingId);
+}

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

@@ -27,6 +27,7 @@ public class TaUserVerify {
 
     private String levelName;
 
+    /** 就是楼栋资料库的id **/
     private Integer roomNoId;
 
     private String roomNoName;

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

@@ -0,0 +1,95 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpBillOrder {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer tpBillId;
+
+    private Integer tpBillInvoiceId;
+
+    private String orderBumber;
+
+    private Integer createUser;
+
+    private Date createDate;
+
+    private Integer updateUser;
+
+    private Date updateDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getTpBillId() {
+        return tpBillId;
+    }
+
+    public void setTpBillId(Integer tpBillId) {
+        this.tpBillId = tpBillId;
+    }
+
+    public Integer getTpBillInvoiceId() {
+        return tpBillInvoiceId;
+    }
+
+    public void setTpBillInvoiceId(Integer tpBillInvoiceId) {
+        this.tpBillInvoiceId = tpBillInvoiceId;
+    }
+
+    public String getOrderBumber() {
+        return orderBumber;
+    }
+
+    public void setOrderBumber(String orderBumber) {
+        this.orderBumber = orderBumber == null ? null : orderBumber.trim();
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+}

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

@@ -0,0 +1,115 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpLevel {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer phaseId;
+
+    private String phaseName;
+
+    private Integer buildingId;
+
+    private String buildingName;
+
+    private Integer unitId;
+
+    private String unitName;
+
+    private String name;
+
+    private String sort;
+
+    private Date createDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getPhaseId() {
+        return phaseId;
+    }
+
+    public void setPhaseId(Integer phaseId) {
+        this.phaseId = phaseId;
+    }
+
+    public String getPhaseName() {
+        return phaseName;
+    }
+
+    public void setPhaseName(String phaseName) {
+        this.phaseName = phaseName == null ? null : phaseName.trim();
+    }
+
+    public Integer getBuildingId() {
+        return buildingId;
+    }
+
+    public void setBuildingId(Integer buildingId) {
+        this.buildingId = buildingId;
+    }
+
+    public String getBuildingName() {
+        return buildingName;
+    }
+
+    public void setBuildingName(String buildingName) {
+        this.buildingName = buildingName == null ? null : buildingName.trim();
+    }
+
+    public Integer getUnitId() {
+        return unitId;
+    }
+
+    public void setUnitId(Integer unitId) {
+        this.unitId = unitId;
+    }
+
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName == null ? null : unitName.trim();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public String getSort() {
+        return sort;
+    }
+
+    public void setSort(String sort) {
+        this.sort = sort == null ? null : sort.trim();
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}

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

@@ -0,0 +1,55 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpPhase {
+    private Integer id;
+
+    private Integer communityId;
+
+    private String name;
+
+    private String sort;
+
+    private Date createDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public String getSort() {
+        return sort;
+    }
+
+    public void setSort(String sort) {
+        this.sort = sort == null ? null : sort.trim();
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}

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

@@ -0,0 +1,95 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpUnit {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer phaseId;
+
+    private String phaseName;
+
+    private Integer buildingId;
+
+    private String buildingName;
+
+    private String name;
+
+    private String sort;
+
+    private Date createDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getPhaseId() {
+        return phaseId;
+    }
+
+    public void setPhaseId(Integer phaseId) {
+        this.phaseId = phaseId;
+    }
+
+    public String getPhaseName() {
+        return phaseName;
+    }
+
+    public void setPhaseName(String phaseName) {
+        this.phaseName = phaseName == null ? null : phaseName.trim();
+    }
+
+    public Integer getBuildingId() {
+        return buildingId;
+    }
+
+    public void setBuildingId(Integer buildingId) {
+        this.buildingId = buildingId;
+    }
+
+    public String getBuildingName() {
+        return buildingName;
+    }
+
+    public void setBuildingName(String buildingName) {
+        this.buildingName = buildingName == null ? null : buildingName.trim();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public String getSort() {
+        return sort;
+    }
+
+    public void setSort(String sort) {
+        this.sort = sort == null ? null : sort.trim();
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}

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

@@ -8,9 +8,9 @@ public interface AliPayServiceI {
 	/**
 	 * 微信支付统一下单
 	 * @return
-	 * @param billInvoiceId
+	 * @param outTradeNo
 	 * @param userElement
 	 */
-	String AliPayOrder(Integer billInvoiceId, UserElement userElement) throws Exception;
+	String AliPayOrder(String outTradeNo, UserElement userElement) throws Exception;
 	
 }

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

@@ -1,18 +1,21 @@
 package com.community.huiju.service;
 
+import com.community.commom.session.UserElement;
+
 import java.util.List;
 import java.util.Map;
 
 public interface BillServiceI {
 	/**
 	 * 根据payType分页获取缴费或未缴费的数据
-	 * @param communityId
+	 *
+	 * @param userElement
 	 * @param payType
 	 * @param pageNum
 	 * @param pageSize
 	 * @return
 	 */
-	Map<String, Object> getBillsList(Integer communityId, Integer payType, Integer userId ,Integer pageNum, Integer pageSize);
+	Map<String, Object> getBillsList(UserElement userElement, Integer payType, Integer pageNum, Integer pageSize);
 	
 	/**
 	 * 获取账单的详细信息

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

@@ -19,13 +19,13 @@ public interface IBuildingOwnerInfo {
      * @param buildingId
      * @param unitId
      * @param levelId
-     * @param roomNoId
      * @return
      */
-    ResponseBean selectBuildList(Integer communityId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId);
+    ResponseBean selectBuildList(Integer communityId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId);
 
     /**
      * 根据 小区/期/楼栋/单元/楼层/户号
+     * 并校验这个用户，是否绑定了这个房产
      * @param phaseId
      * @param buildingId
      * @param unitId

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

@@ -43,10 +43,11 @@ public interface ITaUserService {
 
     /**
      * 修改当前用户手机号
-     * @param id
+     * @param userElement
+     * @param paramets
      * @return
      */
-    ResponseBean upDateloginName(Integer id, String paramets,Integer communityId);
+    ResponseBean updateLoginName(UserElement userElement, String paramets);
 
     /**
      * 获取房屋成员列表
@@ -57,10 +58,11 @@ public interface ITaUserService {
 
     /**
      * 修改用户
-     * @param user
+     * @param userElement
+     * @param parameter
      * @return
      */
-    ResponseBean modifyUser(TaUser user);
+    ResponseBean modifyUser(UserElement userElement, String parameter);
 
     /**
      * 停用用户 或者 启用用户

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

@@ -2,16 +2,17 @@ package com.community.huiju.service;
 
 import com.community.commom.session.UserElement;
 
+import java.util.List;
 import java.util.Map;
 
 public interface WxPayServiceI {
 	/**
 	 * 微信支付统一下单
 	 * @return
-	 * @param billInvoiceId
+	 * @param outTradeNo
 	 * @param userElement
 	 */
-	Map<String, String> wxUnifiedOrder(Integer billInvoiceId, UserElement userElement) throws Exception;
+	Map<String, String> wxUnifiedOrder(String outTradeNo, UserElement userElement) throws Exception;
 	
 	/**
 	 * 支付成功的回调
@@ -28,16 +29,16 @@ public interface WxPayServiceI {
 	
 	/**
 	 * 准备支付
-	 * @param billInvoiceId
+	 * @param billInvoiceIdArray
 	 * @param userElement
 	 * @throws Exception
 	 */
-	void wxStartPay(Integer billInvoiceId, UserElement userElement) throws Exception;
+	String wxStartPay(List<Integer> billInvoiceIdArray, UserElement userElement) throws Exception;
 	
 	/**
 	 * 取消支付
-	 * @param billInvoiceId
+	 * @param outTradeNo 订单号
 	 * @param userElement
 	 */
-	void wxCancelPay(Integer billInvoiceId, UserElement userElement) throws Exception;
+	void wxCancelPay(String outTradeNo, UserElement userElement) throws Exception;
 }

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

@@ -11,15 +11,13 @@ import com.community.huiju.common.wxpay.HfWxConfig;
 import com.community.huiju.common.wxpay.WXPay;
 import com.community.huiju.common.wxpay.WXPayConstants;
 import com.community.huiju.common.wxpay.WXPayUtil;
-import com.community.huiju.dao.TaSysRoleMapper;
-import com.community.huiju.dao.TaUserMapper;
-import com.community.huiju.dao.TpBillInvoiceMapper;
-import com.community.huiju.dao.TpBillMapper;
-import com.community.huiju.dao.TpBillStatementMapper;
+import com.community.huiju.dao.*;
 import com.community.huiju.model.TaSysRole;
 import com.community.huiju.model.TaUser;
 import com.community.huiju.model.TpBillInvoice;
+import com.community.huiju.model.TpBillOrder;
 import com.community.huiju.service.AliPayServiceI;
+import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +26,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 import static com.alipay.api.AlipayConstants.CHARSET_UTF8;
 
@@ -54,6 +53,9 @@ public class AliPayServiceImpl implements AliPayServiceI {
 
 	@Autowired
 	private TaSysRoleMapper taSysRoleMapper;
+
+	@Autowired
+	private TpBillOrderMapper tpBillOrderMapper;
 	
 	@Value("${alipay.APP_PRIVATE_KEY}")
 	private String APP_PRIVATE_KEY;
@@ -68,29 +70,23 @@ public class AliPayServiceImpl implements AliPayServiceI {
 	 * 支付宝统一下单
 	 *
 	 * @return
-	 * @param billInvoiceId
+	 * @param outTradeNo
 	 * @param userElement
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public String AliPayOrder(Integer billInvoiceId, UserElement userElement) throws Exception {
+	public String AliPayOrder(String outTradeNo, UserElement userElement) throws Exception {
 		Integer userId = userElement.getId();
 
-		// 如果是家属/租客, 应该用业主的用户id
-		TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
-		TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(userId);
-		if (null != taSysRole && taSysRole.getId().intValue() != 1) {
-			TaUser ownerUser = taUserMapper.selectByPrimaryKey(taUser.getParentId());
-			userId = ownerUser.getId();
-		}
-
 		//获取支付金额
-		TpBillInvoice tpBillInvoice = tpBillInvoiceMapper.selectByIdAndUserId(billInvoiceId,userId,userElement.getCommunityId());
-		if (null == tpBillInvoice){
+		List<TpBillOrder> billOrderList = tpBillOrderMapper.selectByOrderBumber(outTradeNo);
+		if (CollectionUtils.isEmpty(billOrderList)){
 			throw new Exception("订单不存在");
-		}else if (!tpBillInvoice.getBillStatus().equals("3")){
-			throw new Exception("不是正在支付的订单");
 		}
+
+		// 计算金额
+		Integer payPrice = billOrderList.stream().mapToInt(e -> tpBillInvoiceMapper.selectByPrimaryKey(e.getTpBillInvoiceId()).getPayPrice()).sum();
+
 		
 		//下单
 		AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", ALI_APP_ID, APP_PRIVATE_KEY, "json", CHARSET_UTF8, ALIPAY_PUBLIC_KEY, "RSA2");
@@ -98,11 +94,11 @@ public class AliPayServiceImpl implements AliPayServiceI {
 		AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest();
 		//SDK已经封装掉了公共参数，这里只需要传入业务参数。以下方法为sdk的model入参方式(model和biz_content同时存在的情况下取biz_content)。
 		AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
-		model.setBody(tpBillInvoice.getBillName());
-		model.setSubject(tpBillInvoice.getBillName());
-		model.setOutTradeNo(tpBillInvoice.getOutTradeNo());
+		model.setBody("缴费");
+		model.setSubject("缴费");
+		model.setOutTradeNo(outTradeNo);
 		model.setTimeoutExpress("30m");
-		model.setTotalAmount(BigDecimal.valueOf(Long.valueOf(tpBillInvoice.getPayPrice())).divide(new BigDecimal(100)).toString());
+		model.setTotalAmount(BigDecimal.valueOf(Long.valueOf(payPrice)).divide(new BigDecimal(100)).toString());
 		model.setProductCode("QUICK_MSECURITY_PAY");
 		request.setBizModel(model);
 		request.setNotifyUrl("http://106.14.20.193:8086/app-api/aliPayNotify");

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

@@ -1,10 +1,13 @@
 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.model.TaSysRole;
 import com.community.huiju.model.TaUser;
+import com.community.huiju.model.TaUserVerify;
 import com.community.huiju.service.BillServiceI;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
@@ -30,30 +33,30 @@ public class BillServiceImpl implements BillServiceI {
 
 	@Autowired
 	private TaSysRoleMapper taSysRoleMapper;
+
+	@Autowired
+	private TaUserVerifyMapper taUserVerifyMapper;
 	
 	/**
 	 * 根据payType分页获取缴费或未缴费的数据
-	 * @param communityId
+	 * @param userElement
 	 * @param payType
 	 * @param pageNum
 	 * @param pageSize
 	 * @return
 	 */
 	@Override
-	public Map<String, Object> getBillsList(Integer communityId, Integer payType, Integer userId ,Integer pageNum, Integer pageSize) {
+	public Map<String, Object> getBillsList(UserElement userElement, Integer payType, Integer pageNum, Integer pageSize) {
 		//使用分页插件
 		Page<Map<String,Object>> page = PageHelper.startPage(pageNum, pageSize);
 
-		TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
+		/**
+		 * 账单 关联的是房产, 查询 审核表， 审核表里面的 roomNoId 就是楼栋资料库的id
+ 		 */
 
-		TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(userId);
-		// 如果不是业主
-		if (null != taSysRole && taSysRole.getId().intValue() != 1) {
-			TaUser ownerUser = taUserMapper.selectByPrimaryKey(taUser.getParentId());
-			userId = ownerUser.getId();
-		}
+		TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
 
-		List<Map<String,Object>> billsList = tpBillInvoiceMapper.getBillsList(communityId, userId, payType);
+		List<Map<String,Object>> billsList = tpBillInvoiceMapper.getBillsList(userElement.getCommunityId(), userVerify.getRoomNoId(), 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/BuildingOwnerInfoImpl.java

@@ -3,13 +3,8 @@ package com.community.huiju.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
-import com.community.huiju.dao.TaUserVerifyMapper;
-import com.community.huiju.dao.TpBuildingMapper;
-import com.community.huiju.dao.TpBuildingOwnerInfoMapper;
-import com.community.huiju.model.TaUserVerify;
-import com.community.huiju.model.TpBuilding;
-import com.community.huiju.model.TpBuildingOwnerInfo;
-import com.community.huiju.model.TpTransaction;
+import com.community.huiju.dao.*;
+import com.community.huiju.model.*;
 import com.community.huiju.service.IBuildingOwnerInfo;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
@@ -29,21 +24,62 @@ import java.util.Map;
 @Service
 public class BuildingOwnerInfoImpl implements IBuildingOwnerInfo {
 
+    /**
+     * 栋
+     */
     @Autowired
     private TpBuildingMapper tpBuildingMapper;
 
+    /**
+     * 户号 /  楼栋资料库
+     */
     @Autowired
     private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
 
     @Autowired
     private TaUserVerifyMapper taUserVerifyMapper;
 
+    /**
+     * 期
+     */
+    @Autowired
+    private TpPhaseMapper tpPhaseMapper;
+
+    /**
+     * 单元
+     */
+    @Autowired
+    private TpUnitMapper tpUnitMapper;
+
+    /**
+     * 楼层
+     */
+    @Autowired
+    private TpLevelMapper tpLevelMapper;
+
+
     @Override
-    public ResponseBean selectBuildList(Integer communityId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId) {
+    public ResponseBean selectBuildList(Integer communityId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId) {
         ResponseBean responseBean = new ResponseBean();
 
+        // 查询 期 -> 栋 -> 单元 -> 楼层 -> 户号
+        if (null == phaseId && null == buildingId && null == unitId && null == levelId) {
+            List<TpPhase> phaseList = tpPhaseMapper.selectByAddress(communityId);
+            responseBean.addSuccess(phaseList);
+        } else if (null == buildingId && null == unitId && null == levelId) {
+            List<TpBuilding> buildingList = tpBuildingMapper.selectByAddress(communityId, phaseId);
+            responseBean.addSuccess(buildingList);
+        } else if (null == unitId && null == levelId) {
+            List<TpUnit> unitList = tpUnitMapper.selectByAddress(communityId, phaseId, buildingId);
+            responseBean.addSuccess(unitList);
+        } else if (null == levelId) {
+            List<TpLevel> levelList = tpLevelMapper.selectByAddress(communityId, phaseId, buildingId, unitId);
+            responseBean.addSuccess(levelList);
+        } else {
+            List<TpBuildingOwnerInfo> buildingOwnerInfoList = tpBuildingOwnerInfoMapper.selectByAddress(communityId, phaseId, buildingId, unitId, levelId);
+            responseBean.addSuccess(buildingOwnerInfoList);
+        }
 
-        responseBean.addSuccess(null);
         return responseBean;
     }
 

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

@@ -6,6 +6,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Date;
 

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

@@ -239,35 +239,18 @@ public class TaUserServiceImpl implements ITaUserService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public ResponseBean upDateloginName(Integer id, String paramets,Integer communityId) {
+    public ResponseBean updateLoginName(UserElement userElement, String paramets) {
         ResponseBean response = new ResponseBean();
 
         JSONObject jsonObject = JSONObject.parseObject(paramets);
         String phone = (String) jsonObject.get("phone");
         String code = (String) jsonObject.get("code");
-        String otherUserId = (String) jsonObject.get("otherUserId");
 
-        // 默认为当前用户
-        Integer userId = id;
+        TaUser user=taUserMapper.selectByPrimaryKey(userElement.getId());
 
-        if (StringUtils.isNotBlank(otherUserId)) {
-            /**校验otherUserId是否为当前登入用户的家属和业主**/
-            response=getTaFaceParentId( id, Integer.valueOf(otherUserId));
-            if ("1".equals(response.getCode())) {
-                return response;
-            }
-            userId = Integer.valueOf(otherUserId.trim());
-        }
+        // 校验手机号和验证码
+        iCode.checkPhoneAndCode(phone, code);
 
-        TaUser user=taUserMapper.selectByPrimaryKey(userId);
-        //系统验证码
-        String  codes= (String) AppkeyCache.getCache(phone);
-        //用户电话
-            /*String  phones=user.getLoginName();*/
-        if (!AccountValidatorUtil.isPhone(phone)){
-            response.addError("请输入正确的手机号!");
-            return response;
-        }
         //当前小区下的电话校验
         TaUser loginName=taUserMapper.getByLoginName(user.getCommunityId(),phone);
         if (null!=loginName)  {
@@ -282,42 +265,35 @@ public class TaUserServiceImpl implements ITaUserService {
             return response;
         }
 
-        if ("1234".equals(code)) {
+        // 修改号码
+        TaUser taUser=new TaUser();
+        taUser.setLoginName(phone);
+        taUser.setId(user.getId());
+        taUser.setUpdateDate(new Date());
+        taUser.setUpdateUser(user.getId());
+        taUserMapper.updateLongName(taUser);
+        response.addSuccess("修改成功");
 
-        }else if (StringUtils.isBlank(code) || !codes.equals(code)) {
-            response.addError("验证码错误!");
-            return response;
-        }
-            TaUser taUser=new TaUser();
-            taUser.setLoginName(phone);
-            taUser.setId(userId);
-            taUser.setUpdateDate(new Date());
-            taUser.setUpdateUser(id);
-            taUserMapper.updateLongName(taUser);
-            response.addSuccess("修改成功");
-            AppkeyCache.setCache(user.getLoginName(),"null");
+        /**
+         * 如果是 家属或者租客,修改手机号, 就不允许修改资料库的信息
+         * 根据房产判断 当前是否是 业主
+         */
 
+        TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
+        TaSysRole sysRole = taSysRoleMapper.selectByPrimaryKey(userVerify.getRoleId());
 
-            /**
-             * 如果是家属或者租客,修改手机号, 就不允许修改资料库的信息
-             */
+        // 修改楼栋信息资料库的手机号
+        // 1 业主 2 租客 3 家属
+        // 只允许业主修改
+        if (null != sysRole && sysRole.getId().intValue() == 1) {
+            TpBuildingOwnerInfo buildingOwnerInfo = tpBuildingOwnerInfoMapper.selectByPrimaryKey(userVerify.getRoomNoId());
+            buildingOwnerInfo.setOwnerTel(phone);
+            tpBuildingOwnerInfoMapper.updateByPrimaryKeySelective(buildingOwnerInfo);
+        }
 
-            // 修改楼栋信息资料库的手机号
-            Map<String, Object> roleMap = Maps.newHashMap();
-            roleMap.put("communityId", user.getCommunityId());
-            roleMap.put("userId", userId);
-            TaSysUserRole taSysUserRole = taSysUserRoleMapper.selectByCommunityIdAndUserId(roleMap);
-            // 1 业主 2 租客 3 家属
-            // 只允许业主修改
-            if (taSysUserRole.getRoleId().intValue() == 1) {
-                // TODO 后期可能会有一个业主对应多个小区, 也就是会有多个资料, 具体看需求
-                // TODO 目前是一对一
-                TpBuildingOwnerInfo buildingOwnerInfo = tpBuildingOwnerInfoMapper.selectByPrimaryKey(user.getBuildingOwnerInfoId());
-                buildingOwnerInfo.setOwnerTel(phone);
-                tpBuildingOwnerInfoMapper.updateByPrimaryKeySelective(buildingOwnerInfo);
-            }
-            response.addSuccess(new String[0]);
-            return response;
+        // 给前端返回一个空数组
+        response.addSuccess(new String[0]);
+        return response;
     }
 
     public ResponseBean getTaFaceParentId(Integer userId,Integer otherUserId){
@@ -346,28 +322,33 @@ public class TaUserServiceImpl implements ITaUserService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public ResponseBean modifyUser(TaUser user) {
+    public ResponseBean modifyUser(UserElement userElement, String parameter) {
 
         ResponseBean response = new ResponseBean();
 
-        TaUser taUser = taUserMapper.selectByPrimaryKey(user.getId());
-        HashMap map= new HashMap<>();
-                map.put("communityId",taUser.getCommunityId());
-                map.put("userId",taUser.getId());
-        TaSysUserRole TaSysUserRole= taSysUserRoleMapper.selectByCommunityIdAndUserId(map);
+        // 前台提交的数据
+        TaUser user = JSONObject.parseObject(parameter, TaUser.class);
+        // 数据库数据
+        TaUser taUser = taUserMapper.selectByPrimaryKey(userElement.getId());
+
+        /**
+         * 判断是否 是业主，如果业主就连着 楼栋资料库 信息修改
+         */
+
+        TaSysRole sysRole = taSysRoleMapper.selectByPrimaryKey(userElement.getUserVerifyId());
+
         BeanTools.copyProperties(user, taUser);
-            int result = taUserMapper.updateByPrimaryKeySelective(taUser);
-            int VerifyStatus= Integer.parseInt(taUser.getVerifyStatus());
-            int Role= TaSysUserRole.getRoleId();
-            if (1==VerifyStatus &&1==Role) {
-            TpBuildingOwnerInfo TpBuildingOwnerInfo = new TpBuildingOwnerInfo();
-            TpBuildingOwnerInfo.setOwnerName(user.getUserName());
-            TpBuildingOwnerInfo.setGender(user.getGender());
-            TpBuildingOwnerInfo.setOwnerTel(user.getLoginName());
-            TpBuildingOwnerInfo.setUpdateDate(new Date());
-            TpBuildingOwnerInfo.setUpdateUser(taUser.getId());
-            TpBuildingOwnerInfo.setId(taUser.getBuildingOwnerInfoId());
-            tpBuildingOwnerInfoMapper.updateByPrimaryKeySelective(TpBuildingOwnerInfo);
+        int result = taUserMapper.updateByPrimaryKeySelective(taUser);
+        // int VerifyStatus= Integer.parseInt(taUser.getVerifyStatus());
+        if (1 == sysRole.getId()) {
+            TpBuildingOwnerInfo tpBuildingOwnerInfo = new TpBuildingOwnerInfo();
+            tpBuildingOwnerInfo.setOwnerName(user.getUserName());
+            tpBuildingOwnerInfo.setGender(user.getGender());
+            tpBuildingOwnerInfo.setOwnerTel(user.getLoginName());
+            tpBuildingOwnerInfo.setUpdateDate(new Date());
+            tpBuildingOwnerInfo.setUpdateUser(taUser.getId());
+            tpBuildingOwnerInfo.setId(userElement.getRoomNoId());
+            tpBuildingOwnerInfoMapper.updateByPrimaryKeySelective(tpBuildingOwnerInfo);
         }
         if (result > 0){
             response.addSuccess("修改成功!");
@@ -520,10 +501,10 @@ public class TaUserServiceImpl implements ITaUserService {
             response.addError("当前用户不存在!");
             return response;
         }
-        if (taUser.getVerifyStatus().equals("0") || taUser.getVerifyStatus().equals("2")) {
-            response.addError("对不起,您未认证或认证已作废!");
-            return response;
-        }
+//        if (taUser.getVerifyStatus().equals("0") || taUser.getVerifyStatus().equals("2")) {
+//            response.addError("对不起,您未认证或认证已作废!");
+//            return response;
+//        }
         // 当前用户的身份
         TaSysRole role = taSysRoleMapper.findRoleByUserId(taUser.getId());
         if (!"OWNER".equals(role.getRoleName())) {
@@ -807,13 +788,22 @@ public class TaUserServiceImpl implements ITaUserService {
         // 获取用户
         TaUser user = taUserMapper.selectByPrimaryKey(userElement.getId());
         if (null == user) {
-            response.addError("业主用户不存在！");
+            response.addError("用户不存在！");
             return response;
         }
+        // 当 解除了这个房产关联关系的时候，就不能获取到用户信息
+        TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
+        if (null == userVerify) {
+            response.addError("无关联该房产");
+            return response;
+        }
+
+        // 查询 家属或者租客
         if (null != userId) {
             TaUser todUser = taUserMapper.selectByPrimaryKey(userId);
+            TaUserVerify todUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userId, userElement.getCommunityId(), userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(), userElement.getLevelId(), userElement.getRoomNoId());
             // 判断 家属或者租客 属不属于这个业主的下面
-            if (todUser != null && !user.getId().equals(todUser.getParentId())) {
+            if (null == todUserVerify) {
                 response.addError("您的下面没有该家属或者租客!");
                 return response;
             }
@@ -970,8 +960,14 @@ public class TaUserServiceImpl implements ITaUserService {
         if ("1".equals(verifyStatus)) {
             // 设置 userVO 信息
             setUserVoProperties(userVerify.getCommunityId(), taUserVO);
-
+            taUserVO.setPhaseId(userVerify.getPhaseId());
+            taUserVO.setBuildingId(userVerify.getBuildingId());
+            taUserVO.setUnitId(userVerify.getUnitId());
+            taUserVO.setLevelId(userVerify.getLevelId());
+            taUserVO.setRoomNoId(userVerify.getRoomNoId());
             taUserVO.setAddressBuilding(userVerify.getPhaseName() + userVerify.getBuildingName() + userVerify.getUnitName() + userVerify.getLevelName() + userVerify.getRoomNoName());
+
+
             TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(userVerify.getRoleId());
             taUserVO.setRole(taSysRole.getRoleName());
 

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

@@ -33,15 +33,42 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
     @Autowired
     private TaSysRoleMapper taSysRoleMapper;
 
-    @Autowired
-    private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
-
     @Autowired
     private SysNationMapper sysNationMapper;
 
     @Autowired
     private TaUserMapper taUserMapper;
 
+    /**
+     * 期
+     */
+    @Autowired
+    private TpPhaseMapper tpPhaseMapper;
+
+    /**
+     * 单元
+     */
+    @Autowired
+    private TpUnitMapper tpUnitMapper;
+
+    /**
+     * 楼层
+     */
+    @Autowired
+    private TpLevelMapper tpLevelMapper;
+
+    /**
+     * 栋
+     */
+    @Autowired
+    private TpBuildingMapper tpBuildingMapper;
+
+    /**
+     * 户号 /  楼栋资料库
+     */
+    @Autowired
+    private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
+
     @Override
     public ResponseBean getToAuditNotApproved(UserElement userElement, Integer userVerifyId) {
         ResponseBean responseBean = new ResponseBean();
@@ -50,7 +77,6 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
         taUserVerify.setRoleName(taSysRole.getRoleName());
         if ("2".equals(taUserVerify.getVerifyStatus())) {
 
-            // TODO 楼栋资料库查询有变动
             // 开始查询 业主
             TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(taUserVerify.getCommunityId(), taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(), taUserVerify.getLevelId(), taUserVerify.getRoomNoId());
             taUserVerify.setOwnerName(tpBuildingOwnerInfo.getOwnerName());
@@ -71,11 +97,23 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
         String roleName = jsonObject.getString("roleName");
         TaSysRole sysRole = taSysRoleMapper.selectByRoleName(roleName);
 
+        // 查询 期/栋/单元/楼层/户号 -> 设置 相应 id 和 name
+        TpPhase phase = tpPhaseMapper.selectByPrimaryKey(taUserVerify.getPhaseId());
+        TpBuilding building = tpBuildingMapper.selectByPrimaryKey(taUserVerify.getBuildingId());
+        TpUnit unit = tpUnitMapper.selectByPrimaryKey(taUserVerify.getUnitId());
+        TpLevel level = tpLevelMapper.selectByPrimaryKey(taUserVerify.getLevelId());
+        TpBuildingOwnerInfo buildingOwnerInfo = tpBuildingOwnerInfoMapper.selectByPrimaryKey(taUserVerify.getRoomNoId());
+
         taUserVerify.setRoleId(sysRole.getId());
         taUserVerify.setCommunityId(userElement.getCommunityId());
         taUserVerify.setUserId(userElement.getId());
         taUserVerify.setVerifyStatus("0");
         taUserVerify.setCreateDate(new Date());
+        taUserVerify.setPhaseName(phase.getName());
+        taUserVerify.setBuildingName(building.getName());
+        taUserVerify.setUnitName(unit.getName());
+        taUserVerify.setLevelName(level.getName());
+        taUserVerify.setRoomNoName(buildingOwnerInfo.getName());
 
         int rows = taUserVerifyMapper.insertSelective(taUserVerify);
         if (rows <= 0) {

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

@@ -8,7 +8,9 @@ import com.community.huiju.common.wxpay.WXPayUtil;
 import com.community.huiju.dao.*;
 import com.community.huiju.model.*;
 import com.community.huiju.service.WxPayServiceI;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,9 +18,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.Instant;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 
 /**
  * @author FXF
@@ -47,46 +49,40 @@ public class WxPayServiceImpl implements WxPayServiceI {
 	@Autowired
 	private TpMessageMapper tpMessageMapper;
 
+	@Autowired
+	private TpBillOrderMapper tpBillOrderMapper;
+
 	/**
 	 * 微信支付统一下单
 	 *
 	 * @return
-	 * @param billInvoiceId
+	 * @param orderNo
 	 * @param userElement
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public Map<String, String> wxUnifiedOrder(Integer billInvoiceId, UserElement userElement) throws Exception {
+	public Map<String, String> wxUnifiedOrder(String orderNo, UserElement userElement) throws Exception {
 		HfWxConfig config = new HfWxConfig();
 		WXPay wxpay = new WXPay(config);
-
-		Integer userId = userElement.getId();
-
-		// 如果是家属/租客, 应该用业主的用户id
-		TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
-		TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(userId);
-		if (null != taSysRole && taSysRole.getId().intValue() != 1) {
-			TaUser ownerUser = taUserMapper.selectByPrimaryKey(taUser.getParentId());
-			userId = ownerUser.getId();
-		}
 		
 		//获取支付金额
-		TpBillInvoice tpBillInvoice = tpBillInvoiceMapper.selectByIdAndUserId(billInvoiceId,userId,userElement.getCommunityId());
-		if (null == tpBillInvoice){
+		List<TpBillOrder> billOrderList = tpBillOrderMapper.selectByOrderBumber(orderNo);
+		if (CollectionUtils.isEmpty(billOrderList)){
 			throw new Exception("订单不存在");
-		}else if (!tpBillInvoice.getBillStatus().equals("3")){
-			throw new Exception("不是正在支付的订单");
 		}
+
+		// 计算金额
+		Integer payPrice = billOrderList.stream().mapToInt(e -> tpBillInvoiceMapper.selectByPrimaryKey(e.getTpBillInvoiceId()).getPayPrice()).sum();
 		
 		//下单
 		Map<String, String> data = new HashMap<String, String>();
-		data.put("body", tpBillInvoice.getBillName());
+		data.put("body", "缴费");
 		//商品号唯一
-		data.put("out_trade_no", tpBillInvoice.getOutTradeNo());
+		data.put("out_trade_no", orderNo);
 		data.put("device_info", "");
 		data.put("fee_type", "CNY");
 		//金额 后台计算
-		data.put("total_fee", String.valueOf(tpBillInvoice.getPayPrice()));
+		data.put("total_fee", String.valueOf(payPrice));
 		//终端IP
 		data.put("spbill_create_ip", "123.12.12.123");
 		//回调地址
@@ -123,61 +119,64 @@ public class WxPayServiceImpl implements WxPayServiceI {
 	@Transactional(rollbackFor = Exception.class)
 	public String wxNotify(Map<String, String> resultMap) throws Exception {
 		String outTradeNo = resultMap.get("out_trade_no");
-		TpBillInvoice tpBillInvoice = tpBillInvoiceMapper.selectByOutTradeNo(outTradeNo);
-		if (null == tpBillInvoice){
+		List<TpBillOrder> billOrderList = tpBillOrderMapper.selectByOrderBumber(outTradeNo);
+		if (CollectionUtils.isEmpty(billOrderList)){
 			return "不存在的订单";
-		}else if (!tpBillInvoice.getBillStatus().equals("3")){
-			return "订单状态出错";
 		}
 
-
 		// 缴费人在准备支付状态下更新, 这里是微信的回调所有没有 token
 
-		// 更新为正在支付状态
-		// 更改收费单的 缴费时间, 修改人, 修改时间
-		tpBillInvoice.setBillStatus("1");
-		tpBillInvoice.setPayDate(new Date());
-		tpBillInvoice.setUpdateDate(new Date());
-		// 缴费方式  0：微信支付  1：线下缴费 2.支付宝支付
-		tpBillInvoice.setPayType(resultMap.get("pay_type"));
-		tpBillInvoiceMapper.updateByPrimaryKeySelective(tpBillInvoice);
-
-		//插入流水账单表
-		TpBillStatement tpBillStatement = new TpBillStatement();
-		tpBillStatement.setBillInvoiceId(tpBillInvoice.getId());
-		tpBillStatement.setCommunityId(tpBillInvoice.getCommunityId());
-		tpBillStatement.setTaUserId(tpBillInvoice.getTaUserId());
-		tpBillStatement.setPayPrice(tpBillInvoice.getPayPrice());
-		tpBillStatement.setPayName(tpBillInvoice.getPayName());
-		tpBillStatement.setPayRemark(tpBillInvoice.getBillName());
-		tpBillStatement.setPayType(resultMap.get("pay_type"));
-		tpBillStatement.setCreateTime(new Date());
-		tpBillStatementMapper.insert(tpBillStatement);
-
-		// 更新 收费单流水id
-		tpBillInvoice.setBillStatementId(tpBillStatement.getId());
-		tpBillInvoiceMapper.updateByPrimaryKeySelective(tpBillInvoice);
-
-		// 更新收费组的 未交费用户数 和 已缴费用户数
-		TpBill tpBill = tpBillMapper.selectByPrimaryKey(tpBillInvoice.getBillId());
-		tpBill.setPayedNum(tpBill.getPayedNum() + 1);
-		tpBill.setUnpayedNum(tpBill.getUnpayedNum() - 1);
-		// 如果为零, 表示这个收费组收费完成
-		if (tpBill.getUnpayedNum() <= 0) {
-			tpBill.setBillStatus("1");
-			tpBill.setUnpayedNum(0);
-		}
-		tpBillMapper.updateByPrimaryKeySelective(tpBill);
+		for ( TpBillOrder billOrder : billOrderList){
+			TpBillInvoice tpBillInvoice = tpBillInvoiceMapper.selectByPrimaryKey(billOrder.getTpBillInvoiceId());
+			if (!tpBillInvoice.getBillStatus().equals("3")){
+				return "订单状态出错";
+			}
+
+			// 更新为正在支付状态
+			// 更改收费单的 缴费时间, 修改人, 修改时间
+			tpBillInvoice.setBillStatus("1");
+			tpBillInvoice.setPayDate(new Date());
+			tpBillInvoice.setUpdateDate(new Date());
+			// 缴费方式  0：微信支付  1：线下缴费 2.支付宝支付
+			tpBillInvoice.setPayType(resultMap.get("pay_type"));
+			tpBillInvoiceMapper.updateByPrimaryKeySelective(tpBillInvoice);
+
+			//插入流水账单表
+			TpBillStatement tpBillStatement = new TpBillStatement();
+			tpBillStatement.setBillInvoiceId(tpBillInvoice.getId());
+			tpBillStatement.setCommunityId(tpBillInvoice.getCommunityId());
+			tpBillStatement.setTaUserId(tpBillInvoice.getTaUserId());
+			tpBillStatement.setPayPrice(tpBillInvoice.getPayPrice());
+			tpBillStatement.setPayName(tpBillInvoice.getPayName());
+			tpBillStatement.setPayRemark(tpBillInvoice.getBillName());
+			tpBillStatement.setPayType(resultMap.get("pay_type"));
+			tpBillStatement.setCreateTime(new Date());
+			tpBillStatementMapper.insert(tpBillStatement);
+
+			// 更新 收费单流水id
+			tpBillInvoice.setBillStatementId(tpBillStatement.getId());
+			tpBillInvoiceMapper.updateByPrimaryKeySelective(tpBillInvoice);
 
+			// 更新收费组的 未交费用户数 和 已缴费用户数
+			TpBill tpBill = tpBillMapper.selectByPrimaryKey(tpBillInvoice.getBillId());
+			tpBill.setPayedNum(tpBill.getPayedNum() + 1);
+			tpBill.setUnpayedNum(tpBill.getUnpayedNum() - 1);
+			// 如果为零, 表示这个收费组收费完成
+			if (tpBill.getUnpayedNum() <= 0) {
+				tpBill.setBillStatus("1");
+				tpBill.setUnpayedNum(0);
+			}
+			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);
+			// 把相对应的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);
+		}
 
 		return "success";
 	}
@@ -199,84 +198,122 @@ public class WxPayServiceImpl implements WxPayServiceI {
 	
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void wxStartPay(Integer billInvoiceId, UserElement userElement) throws Exception {
-
-		Integer userId = userElement.getId();
+	public String wxStartPay(List<Integer> billInvoiceIdArray, UserElement userElement) throws Exception {
 
 		// 如果是家属/租客, 应该用业主的用户id
-		TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
-		TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(userId);
-		if (null != taSysRole && taSysRole.getId().intValue() != 1) {
-			TaUser ownerUser = taUserMapper.selectByPrimaryKey(taUser.getParentId());
-			userId = ownerUser.getId();
-		}
+		TaUser taUser = taUserMapper.selectByPrimaryKey(userElement.getId());
+		List<TpBillOrder> billOrderList = Lists.newArrayList();
+
+		Random random = new Random();
+		String orderNo = String.valueOf(System.currentTimeMillis()) + random.nextInt();
 
 		//获取支付金额
-		TpBillInvoice tpBillInvoice = tpBillInvoiceMapper.selectByIdAndUserId(billInvoiceId,userId,userElement.getCommunityId());
-		if (null == tpBillInvoice){
-			throw new Exception("订单不存在");
-		}else if (!tpBillInvoice.getBillStatus().equals("0")){
-			throw new Exception("正在支付的订单");
+		for (Integer billInvoiceId : billInvoiceIdArray) {
+			TpBillInvoice tpBillInvoice = tpBillInvoiceMapper.selectByIdAndBuildingOwnerInfoId(billInvoiceId,userElement.getRoomNoId(),userElement.getCommunityId());
+			if (null == tpBillInvoice){
+				throw new Exception("订单不存在");
+			}else if (!tpBillInvoice.getBillStatus().equals("0")){
+				throw new Exception("正在支付的订单");
+			}
+
+			TpBillOrder tpBillOrder = new TpBillOrder();
+			tpBillOrder.setCommunityId(userElement.getCommunityId());
+			tpBillOrder.setTpBillId(tpBillInvoice.getBillId());
+			tpBillOrder.setTpBillInvoiceId(tpBillInvoice.getId());
+			tpBillOrder.setCreateDate(new Date());
+			tpBillOrder.setCreateUser(userElement.getId());
+			tpBillOrder.setUpdateDate(new Date());
+			tpBillOrder.setUpdateUser(userElement.getId());
+			tpBillOrder.setOrderBumber(orderNo);
+
+			billOrderList.add(tpBillOrder);
 		}
 
+
 		//更新为正在支付状态
-		updateBillInvoiceBillStatus(billInvoiceId, taUser.getUserName(),"3");
+		updateBillInvoiceBillStatus(billInvoiceIdArray, taUser.getUserName(),"3");
+
+		// 生成缴费订单
+		tpBillOrderMapper.batchInsertSelective(billOrderList);
+
+		return orderNo;
 	}
 	
 	/**
 	 * 取消支付
 	 *
-	 * @param billInvoiceId
+	 * @param outTradeNo
 	 * @param userElement
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void wxCancelPay(Integer billInvoiceId, UserElement userElement) throws Exception {
+	public void wxCancelPay(String outTradeNo, UserElement userElement) throws Exception {
+
+//		Integer userId = userElement.getId();
+//
+//		//获取支付金额
+//		TpBillInvoice tpBillInvoice = tpBillInvoiceMapper.selectByIdAndUserId(billInvoiceId,userId,userElement.getCommunityId());
+//		if (null == tpBillInvoice){
+//			throw new Exception("订单不存在");
+//		}else if (!tpBillInvoice.getBillStatus().equals("3")){
+//			throw new Exception("不是正在支付的订单");
+//		}
+//		//更新为正在支付状态
+//		updateBillInvoiceBillStatus(billInvoiceId,"0");
 
-		Integer userId = userElement.getId();
 
-		// 如果是家属/租客, 应该用业主的用户id
-		TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
-		TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(userId);
-		if (null != taSysRole && taSysRole.getId().intValue() != 1) {
-			TaUser ownerUser = taUserMapper.selectByPrimaryKey(taUser.getParentId());
-			userId = ownerUser.getId();
-		}
 
 		//获取支付金额
-		TpBillInvoice tpBillInvoice = tpBillInvoiceMapper.selectByIdAndUserId(billInvoiceId,userId,userElement.getCommunityId());
-		if (null == tpBillInvoice){
+		List<TpBillOrder> billOrderList = tpBillOrderMapper.selectByOrderBumber(outTradeNo);
+		if (CollectionUtils.isEmpty(billOrderList)){
 			throw new Exception("订单不存在");
-		}else if (!tpBillInvoice.getBillStatus().equals("3")){
-			throw new Exception("不是正在支付的订单");
 		}
+
+		List<TpBillInvoice> billInvoiceList = Lists.newArrayList();
+		for (TpBillOrder tpBillOrder : billOrderList) {
+			TpBillInvoice billInvoice = tpBillInvoiceMapper.selectByPrimaryKey(tpBillOrder.getTpBillInvoiceId());
+			if (!billInvoice.getBillStatus().equals("3")){
+				throw new Exception("不是正在支付的订单");
+			}
+			billInvoiceList.add(billInvoice);
+		}
+
+		// 缴费单id集合
+		List<Integer> billInvoiceIdList = billInvoiceList.stream().map(e -> e.getId()).collect(Collectors.toList());
+
 		//更新为正在支付状态
-		updateBillInvoiceBillStatus(billInvoiceId,"0");
+		updateBillInvoiceBillStatus(billInvoiceIdList,"0");
 	}
 	
 	/**
 	 * 更新支付状态
-	 * @param billInvoiceId
+	 * @param billInvoiceIdList
 	 * @param billStatus
 	 */
-	private void updateBillInvoiceBillStatus(Integer billInvoiceId, String billStatus) {
-		TpBillInvoice tpBillInvoiceUpdate = new TpBillInvoice();
-		tpBillInvoiceUpdate.setBillStatus(billStatus);
-		tpBillInvoiceUpdate.setId(billInvoiceId);
-		tpBillInvoiceMapper.updateByPrimaryKeySelective(tpBillInvoiceUpdate);
+	private void updateBillInvoiceBillStatus(List<Integer> billInvoiceIdList, String billStatus) {
+		billInvoiceIdList.forEach(e -> {
+			TpBillInvoice tpBillInvoiceUpdate = new TpBillInvoice();
+			tpBillInvoiceUpdate.setBillStatus(billStatus);
+			tpBillInvoiceUpdate.setId(e);
+			tpBillInvoiceMapper.updateByPrimaryKeySelective(tpBillInvoiceUpdate);
+		});
+
 	}
 
 	/**
 	 * 更新支付状态
-	 * @param billInvoiceId
+	 * @param billInvoiceIdList
 	 * @param userName 缴费人
 	 * @param billStatus
 	 */
-	private void updateBillInvoiceBillStatus(Integer billInvoiceId, String userName, String billStatus) {
-		TpBillInvoice tpBillInvoiceUpdate = new TpBillInvoice();
-		tpBillInvoiceUpdate.setBillStatus(billStatus);
-		tpBillInvoiceUpdate.setId(billInvoiceId);
-		tpBillInvoiceUpdate.setPayName(userName);
-		tpBillInvoiceMapper.updateByPrimaryKeySelective(tpBillInvoiceUpdate);
+	private void updateBillInvoiceBillStatus(List<Integer> billInvoiceIdList, String userName, String billStatus) {
+		billInvoiceIdList.forEach(e -> {
+			TpBillInvoice tpBillInvoiceUpdate = new TpBillInvoice();
+			tpBillInvoiceUpdate.setBillStatus(billStatus);
+			tpBillInvoiceUpdate.setId(e);
+			tpBillInvoiceUpdate.setPayName(userName);
+			tpBillInvoiceMapper.updateByPrimaryKeySelective(tpBillInvoiceUpdate);
+		});
+
 	}
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/vo/TaUserVO.java

@@ -73,4 +73,18 @@ public class TaUserVO {
     /** 审核的id **/
     private Integer userVerifyId;
 
+    /**  期id **/
+    private Integer phaseId;
+
+    /**  栋id **/
+    private Integer buildingId;
+
+    /**  单元id **/
+    private Integer unitId;
+
+    /**  楼层id **/
+    private Integer levelId;
+
+    /**  户号id **/
+    private Integer roomNoId;
 }

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

@@ -35,7 +35,7 @@
     delete from ta_user_verify
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.community.huiju.model.TaUserVerify" >
+  <insert id="insert" parameterType="com.community.huiju.model.TaUserVerify"  keyColumn="id" useGeneratedKeys="true" >
     insert into ta_user_verify (id, user_id, community_id,
       role_id, phase_id, phase_name,
       building_id, building_name, unit_id,
@@ -49,7 +49,7 @@
       #{roomNoId,jdbcType=INTEGER}, #{roomNoName,jdbcType=VARCHAR}, #{verifyStatus,jdbcType=VARCHAR},
       #{createDate,jdbcType=TIMESTAMP}, #{verifyName,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.community.huiju.model.TaUserVerify" >
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaUserVerify" keyColumn="id" useGeneratedKeys="true">
     insert into ta_user_verify
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >

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

@@ -248,7 +248,7 @@
             AND (i.bill_status = 1 or i.bill_status = 2)
           </if>
           and i.status=1
-          AND i.ta_user_id = #{userId,jdbcType=INTEGER}
+          AND i.building_owner_info_id = #{buildingOwnerInfoId,jdbcType=INTEGER}
   </select>
 
   <select id="getBillInvoiceDetail" resultType="map">
@@ -278,7 +278,7 @@
     AND i.community_id = #{communityId,jdbcType=INTEGER}
   </select>
 
-  <select id="selectByIdAndUserId" resultType="com.community.huiju.model.TpBillInvoice" >
+  <select id="selectByIdAndBuildingOwnerInfoId" resultType="com.community.huiju.model.TpBillInvoice" >
     SELECT
         t.id,
         t.community_id AS communityId,
@@ -298,7 +298,7 @@
     where t.id = #{id,jdbcType=INTEGER}
     and t.community_id = #{communityId,jdbcType=INTEGER}
     and t.status = 1
-    and t.ta_user_id = #{userId,jdbcType=INTEGER}
+    and t.building_owner_info_id = #{buildingOwnerInfoId,jdbcType=INTEGER}
   </select>
 
   <select id="selectByOutTradeNo" resultType="com.community.huiju.model.TpBillInvoice" >

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

@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TpBillOrderMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpBillOrder" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="tp_bill_id" property="tpBillId" jdbcType="INTEGER" />
+    <result column="tp_bill_invoice_id" property="tpBillInvoiceId" jdbcType="INTEGER" />
+    <result column="order_bumber" property="orderBumber" jdbcType="VARCHAR" />
+    <result column="create_user" property="createUser" jdbcType="INTEGER" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="update_user" property="updateUser" jdbcType="INTEGER" />
+    <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+  </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
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_bill_order
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_bill_order
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <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
+      )
+    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}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpBillOrder" >
+    insert into tp_bill_order
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="tpBillId != null" >
+        tp_bill_id,
+      </if>
+      <if test="tpBillInvoiceId != null" >
+        tp_bill_invoice_id,
+      </if>
+      <if test="orderBumber != null" >
+        order_bumber,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="updateUser != null" >
+        update_user,
+      </if>
+      <if test="updateDate != null" >
+        update_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="tpBillId != null" >
+        #{tpBillId,jdbcType=INTEGER},
+      </if>
+      <if test="tpBillInvoiceId != null" >
+        #{tpBillInvoiceId,jdbcType=INTEGER},
+      </if>
+      <if test="orderBumber != null" >
+        #{orderBumber,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpBillOrder" >
+    update tp_bill_order
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="tpBillId != null" >
+        tp_bill_id = #{tpBillId,jdbcType=INTEGER},
+      </if>
+      <if test="tpBillInvoiceId != null" >
+        tp_bill_invoice_id = #{tpBillInvoiceId,jdbcType=INTEGER},
+      </if>
+      <if test="orderBumber != null" >
+        order_bumber = #{orderBumber,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        create_user = #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        update_user = #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        update_date = #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpBillOrder" >
+    update tp_bill_order
+    set community_id = #{communityId,jdbcType=INTEGER},
+      tp_bill_id = #{tpBillId,jdbcType=INTEGER},
+      tp_bill_invoice_id = #{tpBillInvoiceId,jdbcType=INTEGER},
+      order_bumber = #{orderBumber,jdbcType=VARCHAR},
+      create_user = #{createUser,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=INTEGER},
+      update_date = #{updateDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <insert id="batchInsertSelective" parameterType="list" >
+    insert into tp_bill_order
+    values
+    <foreach collection="list" index="index" item="item" open="(" close=")" separator="," >
+      <trim suffixOverrides=",">
+        <if test="item.id != null" >
+          #{item.id,jdbcType=INTEGER},
+        </if>
+        <if test="item.communityId != null" >
+          #{item.communityId,jdbcType=INTEGER},
+        </if>
+        <if test="item.tpBillId != null" >
+          #{item.tpBillId,jdbcType=INTEGER},
+        </if>
+        <if test="item.tpBillInvoiceId != null" >
+          #{item.tpBillInvoiceId,jdbcType=INTEGER},
+        </if>
+        <if test="item.orderBumber != null" >
+          #{item.orderBumber,jdbcType=VARCHAR},
+        </if>
+        <if test="item.createUser != null" >
+          #{item.createUser,jdbcType=INTEGER},
+        </if>
+        <if test="item.createDate != null" >
+          #{item.createDate,jdbcType=TIMESTAMP},
+        </if>
+        <if test="item.updateUser != null" >
+          #{item.updateUser,jdbcType=INTEGER},
+        </if>
+        <if test="item.updateDate != null" >
+          #{item.updateDate,jdbcType=TIMESTAMP},
+        </if>
+      </trim>
+    </foreach>
+  </insert>
+</mapper>

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

@@ -23,7 +23,7 @@
     delete from tp_building
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.community.huiju.model.TpBuilding" >
+  <insert id="insert" parameterType="com.community.huiju.model.TpBuilding"  keyColumn="id" useGeneratedKeys="true" >
     insert into tp_building (id, community_id, phase_id,
       phase_name, name, sort,
       create_date)
@@ -31,7 +31,7 @@
       #{phaseName,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{sort,jdbcType=VARCHAR},
       #{createDate,jdbcType=TIMESTAMP})
   </insert>
-  <insert id="insertSelective" parameterType="com.community.huiju.model.TpBuilding" >
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpBuilding"  keyColumn="id" useGeneratedKeys="true" >
     insert into tp_building
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >

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

@@ -40,7 +40,7 @@
     delete from tp_building_owner_info
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.community.huiju.model.TpBuildingOwnerInfo" >
+  <insert id="insert" parameterType="com.community.huiju.model.TpBuildingOwnerInfo"  keyColumn="id" useGeneratedKeys="true" >
     insert into tp_building_owner_info (id, community_id, id_card,
       phase_id, phase_name, building_id,
       building_name, unit_id, unit_name,
@@ -58,7 +58,7 @@
       #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER},
       #{updateDate,jdbcType=TIMESTAMP})
   </insert>
-  <insert id="insertSelective" parameterType="com.community.huiju.model.TpBuildingOwnerInfo" >
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpBuildingOwnerInfo"  keyColumn="id" useGeneratedKeys="true" >
     insert into tp_building_owner_info
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >

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

@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TpLevelMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpLevel" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="phase_id" property="phaseId" jdbcType="INTEGER" />
+    <result column="phase_name" property="phaseName" jdbcType="VARCHAR" />
+    <result column="building_id" property="buildingId" jdbcType="INTEGER" />
+    <result column="building_name" property="buildingName" jdbcType="VARCHAR" />
+    <result column="unit_id" property="unitId" jdbcType="INTEGER" />
+    <result column="unit_name" property="unitName" jdbcType="VARCHAR" />
+    <result column="name" property="name" jdbcType="VARCHAR" />
+    <result column="sort" property="sort" jdbcType="VARCHAR" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, phase_id, phase_name, building_id, building_name, unit_id, unit_name, 
+    name, sort, create_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer"  >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_level
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_level
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpLevel"  keyColumn="id" useGeneratedKeys="true" >
+    insert into tp_level (id, community_id, phase_id, 
+      phase_name, building_id, building_name, 
+      unit_id, unit_name, name, 
+      sort, create_date)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{phaseId,jdbcType=INTEGER}, 
+      #{phaseName,jdbcType=VARCHAR}, #{buildingId,jdbcType=INTEGER}, #{buildingName,jdbcType=VARCHAR}, 
+      #{unitId,jdbcType=INTEGER}, #{unitName,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
+      #{sort,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpLevel"  keyColumn="id" useGeneratedKeys="true" >
+    insert into tp_level
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="phaseId != null" >
+        phase_id,
+      </if>
+      <if test="phaseName != null" >
+        phase_name,
+      </if>
+      <if test="buildingId != null" >
+        building_id,
+      </if>
+      <if test="buildingName != null" >
+        building_name,
+      </if>
+      <if test="unitId != null" >
+        unit_id,
+      </if>
+      <if test="unitName != null" >
+        unit_name,
+      </if>
+      <if test="name != null" >
+        name,
+      </if>
+      <if test="sort != null" >
+        sort,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="phaseId != null" >
+        #{phaseId,jdbcType=INTEGER},
+      </if>
+      <if test="phaseName != null" >
+        #{phaseName,jdbcType=VARCHAR},
+      </if>
+      <if test="buildingId != null" >
+        #{buildingId,jdbcType=INTEGER},
+      </if>
+      <if test="buildingName != null" >
+        #{buildingName,jdbcType=VARCHAR},
+      </if>
+      <if test="unitId != null" >
+        #{unitId,jdbcType=INTEGER},
+      </if>
+      <if test="unitName != null" >
+        #{unitName,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null" >
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null" >
+        #{sort,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpLevel" >
+    update tp_level
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="phaseId != null" >
+        phase_id = #{phaseId,jdbcType=INTEGER},
+      </if>
+      <if test="phaseName != null" >
+        phase_name = #{phaseName,jdbcType=VARCHAR},
+      </if>
+      <if test="buildingId != null" >
+        building_id = #{buildingId,jdbcType=INTEGER},
+      </if>
+      <if test="buildingName != null" >
+        building_name = #{buildingName,jdbcType=VARCHAR},
+      </if>
+      <if test="unitId != null" >
+        unit_id = #{unitId,jdbcType=INTEGER},
+      </if>
+      <if test="unitName != null" >
+        unit_name = #{unitName,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null" >
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null" >
+        sort = #{sort,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpLevel" >
+    update tp_level
+    set community_id = #{communityId,jdbcType=INTEGER},
+      phase_id = #{phaseId,jdbcType=INTEGER},
+      phase_name = #{phaseName,jdbcType=VARCHAR},
+      building_id = #{buildingId,jdbcType=INTEGER},
+      building_name = #{buildingName,jdbcType=VARCHAR},
+      unit_id = #{unitId,jdbcType=INTEGER},
+      unit_name = #{unitName,jdbcType=VARCHAR},
+      name = #{name,jdbcType=VARCHAR},
+      sort = #{sort,jdbcType=VARCHAR},
+      create_date = #{createDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TpPhaseMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpPhase" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="NAME" property="name" jdbcType="VARCHAR" />
+    <result column="sort" property="sort" jdbcType="VARCHAR" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, NAME, sort, create_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_phase
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_phase
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpPhase"  keyColumn="id" useGeneratedKeys="true" >
+    insert into tp_phase (id, community_id, NAME, 
+      sort, create_date)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, 
+      #{sort,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpPhase"  keyColumn="id" useGeneratedKeys="true" >
+    insert into tp_phase
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="name != null" >
+        NAME,
+      </if>
+      <if test="sort != null" >
+        sort,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="name != null" >
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null" >
+        #{sort,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpPhase" >
+    update tp_phase
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="name != null" >
+        NAME = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null" >
+        sort = #{sort,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpPhase" >
+    update tp_phase
+    set community_id = #{communityId,jdbcType=INTEGER},
+      NAME = #{name,jdbcType=VARCHAR},
+      sort = #{sort,jdbcType=VARCHAR},
+      create_date = #{createDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TpUnitMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpUnit" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="phase_id" property="phaseId" jdbcType="INTEGER" />
+    <result column="phase_name" property="phaseName" jdbcType="VARCHAR" />
+    <result column="building_id" property="buildingId" jdbcType="INTEGER" />
+    <result column="building_name" property="buildingName" jdbcType="VARCHAR" />
+    <result column="name" property="name" jdbcType="VARCHAR" />
+    <result column="sort" property="sort" jdbcType="VARCHAR" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, phase_id, phase_name, building_id, building_name, name, sort, create_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_unit
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_unit
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpUnit"  keyColumn="id" useGeneratedKeys="true" >
+    insert into tp_unit (id, community_id, phase_id, 
+      phase_name, building_id, building_name, 
+      name, sort, create_date
+      )
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{phaseId,jdbcType=INTEGER}, 
+      #{phaseName,jdbcType=VARCHAR}, #{buildingId,jdbcType=INTEGER}, #{buildingName,jdbcType=VARCHAR}, 
+      #{name,jdbcType=VARCHAR}, #{sort,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpUnit"  keyColumn="id" useGeneratedKeys="true" >
+    insert into tp_unit
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="phaseId != null" >
+        phase_id,
+      </if>
+      <if test="phaseName != null" >
+        phase_name,
+      </if>
+      <if test="buildingId != null" >
+        building_id,
+      </if>
+      <if test="buildingName != null" >
+        building_name,
+      </if>
+      <if test="name != null" >
+        name,
+      </if>
+      <if test="sort != null" >
+        sort,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="phaseId != null" >
+        #{phaseId,jdbcType=INTEGER},
+      </if>
+      <if test="phaseName != null" >
+        #{phaseName,jdbcType=VARCHAR},
+      </if>
+      <if test="buildingId != null" >
+        #{buildingId,jdbcType=INTEGER},
+      </if>
+      <if test="buildingName != null" >
+        #{buildingName,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null" >
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null" >
+        #{sort,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpUnit" >
+    update tp_unit
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="phaseId != null" >
+        phase_id = #{phaseId,jdbcType=INTEGER},
+      </if>
+      <if test="phaseName != null" >
+        phase_name = #{phaseName,jdbcType=VARCHAR},
+      </if>
+      <if test="buildingId != null" >
+        building_id = #{buildingId,jdbcType=INTEGER},
+      </if>
+      <if test="buildingName != null" >
+        building_name = #{buildingName,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null" >
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null" >
+        sort = #{sort,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpUnit" >
+    update tp_unit
+    set community_id = #{communityId,jdbcType=INTEGER},
+      phase_id = #{phaseId,jdbcType=INTEGER},
+      phase_name = #{phaseName,jdbcType=VARCHAR},
+      building_id = #{buildingId,jdbcType=INTEGER},
+      building_name = #{buildingName,jdbcType=VARCHAR},
+      name = #{name,jdbcType=VARCHAR},
+      sort = #{sort,jdbcType=VARCHAR},
+      create_date = #{createDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

CODE/smart-community/community-common/src/main/java/com/community/commom/session/UserElement.java

@@ -41,4 +41,19 @@ public class UserElement implements Serializable {
     /** 当前登陆的房产 **/
     private Integer userVerifyId;
 
+    /** 当前登录 期id **/
+    private Integer phaseId;
+
+    /** 当前登录 栋id **/
+    private Integer buildingId;
+
+    /** 当前登录 单元id **/
+    private Integer unitId;
+
+    /** 当前登录 楼层id **/
+    private Integer levelId;
+
+    /** 当前登录 户号id **/
+    private Integer roomNoId;
+
 }

CODE/smart-community/property-api/pom.xml

@@ -197,6 +197,13 @@
             <scope>compile</scope>
         </dependency>
 
+		<!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>fastjson</artifactId>
+			<version>1.2.56</version>
+		</dependency>
+
 
     </dependencies>
 

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/BuildingOwnerInfoController.java

@@ -112,16 +112,62 @@ public class BuildingOwnerInfoController extends BaseController {
         return responseBean;
     }
 
-    @ApiOperation(value = "查询 楼栋/单元/楼层/户号", notes = "查询 楼栋/单元/楼层/户号")
+    @ApiOperation(value = "查询 期区", notes = "查询 期区")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "building楼层;" +
-                    "unit单元;level楼层") // ;roomNo户号
     })
-    @RequestMapping(value = "/building/address",method = RequestMethod.POST)
-    public ResponseBean buildingUnitNumber(@RequestBody String parameter, HttpSession session){
+    @RequestMapping(value = "/building/phase",method = RequestMethod.GET)
+    public ResponseBean getPhaseList(HttpSession session){
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = getUserElement(session);
-        responseBean = iBuildingOwnerInfoService.getBuildingOrUnitOrNumber(parameter, userElement.getCommunityId());
+        responseBean = iBuildingOwnerInfoService.getPhaseList(userElement.getCommunityId());
+        return responseBean;
+    }
+    
+    @ApiOperation(value = "查询 期区", notes = "查询 期区")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", name = "phaseId",value = "期区ID")
+    })
+    @RequestMapping(value = "/building/building",method = RequestMethod.GET)
+    public ResponseBean getBuildingList(@RequestParam Integer phaseId, HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBuildingOwnerInfoService.getBuildingList(phaseId,userElement.getCommunityId());
+        return responseBean;
+    }
+    
+    @ApiOperation(value = "查询 期区", notes = "查询 期区")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", name = "buildingId",value = "楼栋ID")
+    })
+    @RequestMapping(value = "/building/unit",method = RequestMethod.GET)
+    public ResponseBean getUnitList(@RequestParam Integer buildingId,HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBuildingOwnerInfoService.getUnitList(buildingId,userElement.getCommunityId());
+        return responseBean;
+    }
+    
+    @ApiOperation(value = "查询 期区", notes = "查询 期区")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", name = "unitId",value = "单元ID")
+    })
+    @RequestMapping(value = "/building/level",method = RequestMethod.GET)
+    public ResponseBean getLevelList(@RequestParam Integer unitId,HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBuildingOwnerInfoService.getLevelList(unitId,userElement.getCommunityId());
+        return responseBean;
+    }
+    
+    @ApiOperation(value = "查询 期区", notes = "查询 期区")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", name = "levelId",value = "楼层ID")
+    })
+    @RequestMapping(value = "/building/roomno",method = RequestMethod.GET)
+    public ResponseBean getRoomNoList(@RequestParam Integer levelId,HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBuildingOwnerInfoService.getRoomNoList(levelId,userElement.getCommunityId());
         return responseBean;
     }
     
@@ -138,7 +184,13 @@ public class BuildingOwnerInfoController extends BaseController {
     public ResponseBean submitExcel(@RequestParam("file") MultipartFile file, HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = getUserElement(session);
-        responseBean = iBuildingOwnerInfoService.submitExcelData(file,userElement);
+        try {
+            responseBean = iBuildingOwnerInfoService.submitExcelData(file,userElement);
+        }catch (Exception e){
+            responseBean.addError("导入数据失败" + e.getMessage());
+            e.printStackTrace();
+        }
+        
         return responseBean;
     }
 

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TaUserMapper.java

@@ -38,10 +38,9 @@ public interface TaUserMapper extends BaseMapper<TaUser> {
     /**
      * 查看是否有未认证数据
      * @param ownerTel
-     * @param communityId
      * @return
      */
-    TaUser selectByTel(@Param("loginName") String ownerTel,@Param("communityId") Integer communityId);
+    TaUser selectByTel(@Param("loginName") String ownerTel);
     
     int batchUpdate(List<TaUser> updataTaUserList);
     

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TaUserVerifyMapper.java

@@ -0,0 +1,18 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TaUserVerify;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * app端用户审核表，存放用户的角色还有房产信息 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-03
+ */
+@Mapper
+public interface TaUserVerifyMapper extends BaseMapper<TaUserVerify> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TaUserVerify.java

@@ -0,0 +1,111 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * app端用户审核表，存放用户的角色还有房产信息
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaUserVerify implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    
+    /**
+     * 用户ID
+     */
+    private Integer userId;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 角色ID
+     */
+    private Integer roleId;
+
+    /**
+     * 期ID
+     */
+    private Integer phaseId;
+
+    /**
+     * 期
+     */
+    private String phaseName;
+
+    /**
+     * 楼栋ID
+     */
+    private Integer buildingId;
+
+    /**
+     * 楼栋
+     */
+    private String buildingName;
+
+    /**
+     * 单元
+     */
+    private Integer unitId;
+
+    /**
+     * 单元
+     */
+    private String unitName;
+
+    /**
+     * 楼层id
+     */
+    private Integer levelId;
+
+    /**
+     * 楼层
+     */
+    private String levelName;
+
+    /**
+     * 户号ID
+     */
+    private Integer roomNoId;
+
+    /**
+     * 户号
+     */
+    private String roomNoName;
+
+    /**
+     * 认证状态  0 是未审核   1是审核通过   2是审核不通过
+     */
+    private String verifyStatus;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 审核人的姓名
+     */
+    private String verifyName;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpBuildingOwnerInfo.java

@@ -1,6 +1,7 @@
 package com.community.huiju.model;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -136,4 +137,14 @@ public class TpBuildingOwnerInfo implements Serializable {
      * 户号树信息
      */
     private Integer treeStatus;
+    
+    /**
+     * 1代表的是资料库信息
+     */
+    private String ownerStatus;
+    /**
+     * 身份
+     */
+    @TableField(exist = false)
+    private String roleName;
 }

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

@@ -59,11 +59,10 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
      *
      *   楼栋是根据 小区ID查询
      *
-     * @param parameter
      * @param communityId
      * @return
      */
-    ResponseBean getBuildingOrUnitOrNumber(String parameter, Integer communityId);
+    ResponseBean getPhaseList(Integer communityId);
     
     /**
      * 上传excel里面的内容
@@ -118,4 +117,36 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
      * @return
      */
     ResponseBean downloadExcel(UserElement userElement);
+    
+    /**
+     * 获取楼栋信息
+     * @param phaseId
+     * @param communityId
+     * @return
+     */
+    ResponseBean getBuildingList(Integer phaseId, Integer communityId);
+    
+    /**
+     * 获取单元信息
+     * @param buildingId
+     * @param communityId
+     * @return
+     */
+    ResponseBean getUnitList(Integer buildingId, Integer communityId);
+    
+    /**
+     * 获取楼层信息
+     * @param unitId
+     * @param communityId
+     * @return
+     */
+    ResponseBean getLevelList(Integer unitId, Integer communityId);
+    
+    /**
+     * 获取室号信息
+     * @param levelId
+     * @param communityId
+     * @return
+     */
+    ResponseBean getRoomNoList(Integer levelId, Integer communityId);
 }

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

@@ -365,8 +365,8 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                 billInvoice.setCreateUser(userElement.getId());
                 billInvoice.setCreateDate(new Date());
                 billInvoice.setStatus(1);
-                Random random = new Random();
-                billInvoice.setOutTradeNo(String.valueOf(System.currentTimeMillis()) + random.nextInt());
+//                Random random = new Random();
+//                billInvoice.setOutTradeNo(String.valueOf(System.currentTimeMillis()) + random.nextInt());
 
 
                 return billInvoice;

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

@@ -53,6 +53,7 @@ import java.util.stream.Collectors;
  */
 @Service("iBuildingOwnerInfoService")
 @Slf4j
+@Transactional
 public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInfoMapper, TpBuildingOwnerInfo> implements IBuildingOwnerInfoService {
 
     @Autowired
@@ -66,10 +67,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
     @Autowired
     private TaSysUserRoleMapper taSysUserRoleMapper;
-
-    @Autowired
-    private ITaUserService iTaUserService;
-
+    
     @Autowired
     private BillInvoiceMapper billInvoiceMapper;
 
@@ -79,6 +77,18 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     @Autowired
     private TpBuildingMapper tpBuildingMapper;
     
+    @Autowired
+    private TaUserVerifyMapper taUserVerifyMapper;
+    
+    @Autowired
+    private TpPhaseMapper tpPhaseMapper;
+    
+    @Autowired
+    private TpUnitMapper tpUnitMapper;
+    
+    @Autowired
+    private TpLevelMapper tpLevelMapper;
+    
     public static final Logger logger = LoggerFactory.getLogger(BuildingOwnerInfoServiceImpl.class);
     
     @Override
@@ -97,20 +107,21 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         Map<String, Object> map = Maps.newHashMap();
         // 小区Id
         map.put("community_id", userElement.getCommunityId());
+        map.put("owner_status", "1");
         // 期
-        map.put("phase", tpBuildingOwnerInfo.getPhaseName());
+        //map.put("phase", tpBuildingOwnerInfo.getPhaseName());
         // 栋
-        map.put("building", tpBuildingOwnerInfo.getBuildingName());
+        //map.put("building", tpBuildingOwnerInfo.getBuildingName());
         // 单元
-        map.put("unit", tpBuildingOwnerInfo.getUnitName());
+        //map.put("unit", tpBuildingOwnerInfo.getUnitName());
         // 楼层
-        map.put("level", tpBuildingOwnerInfo.getLevelName());
+        //map.put("level", tpBuildingOwnerInfo.getLevelName());
         // 房号
-        map.put("room_no", tpBuildingOwnerInfo.getName());
+        //map.put("room_no", tpBuildingOwnerInfo.getName());
 
         QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.allEq(map,false);
-        queryWrapper.like(tpBuildingOwnerInfo.getOwnerName() != null,"owner_name", tpBuildingOwnerInfo.getOwnerName());
+        //queryWrapper.like(tpBuildingOwnerInfo.getOwnerName() != null,"owner_name", tpBuildingOwnerInfo.getOwnerName());
         queryWrapper.orderByDesc("create_date");
 
         // 分页查询
@@ -372,67 +383,21 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     }
 
     @Override
-    public ResponseBean getBuildingOrUnitOrNumber(String parameter,Integer communityId) {
+    public ResponseBean getPhaseList(Integer communityId) {
 
         ResponseBean responseBean = new ResponseBean();
         if (null == communityId || "".equals(communityId)) {
             throw new WisdomException("编号:%s 小区不存在!", communityId);
         }
 
-        TpBuildingOwnerInfo tpBuildingOwnerInfo = JSONObject.parseObject(parameter, TpBuildingOwnerInfo.class);
-
         Map<String, Object> map = Maps.newHashMap();
-
         // 小区
         map.put("community_id", communityId);
-        // 期
-        map.put("phase", tpBuildingOwnerInfo.getPhaseName());
-        // 栋
-        map.put("building", tpBuildingOwnerInfo.getBuildingName());
-        // 单元
-        map.put("unit", tpBuildingOwnerInfo.getUnitName());
-        // 楼层
-        map.put("level", tpBuildingOwnerInfo.getLevelName());
-
-        QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
+        QueryWrapper<TpPhase> queryWrapper = new QueryWrapper<>();
         queryWrapper.allEq(map, false);
-
-        /**
-         * 通过分组来去重
-         *
-         * 1. phase 为空表示为 phase 字段进行分组
-         * 2. building 为空表示为 building 字段进行分组
-         * 3. unit 为空表示为 unit 字段进行分组
-         * 4. level 为空表示为 level 字段进行分组
-         * 5. room_no 为空表示为 room_no 字段进行分组
-         */
-        if (null == tpBuildingOwnerInfo.getPhaseName() || "".equals(tpBuildingOwnerInfo.getPhaseName())) {
-            queryWrapper.groupBy("phase");
-        } else if (null == tpBuildingOwnerInfo.getBuildingName() || "".equals(tpBuildingOwnerInfo.getBuildingName())) {
-            queryWrapper.groupBy("building");
-        } else if (null == tpBuildingOwnerInfo.getUnitName() || "".equals(tpBuildingOwnerInfo.getUnitName())) {
-            queryWrapper.groupBy("unit");
-        } else if (null == tpBuildingOwnerInfo.getLevelName() || "".equals(tpBuildingOwnerInfo.getLevelName())) {
-            queryWrapper.groupBy("level");
-        } else if (null == tpBuildingOwnerInfo.getName() || "".equals(tpBuildingOwnerInfo.getName())) {
-            queryWrapper.groupBy("room_no");
-        }
-
-        /**
-         * 1.如果 楼栋值不存在表示根据小区Id查询时查询楼栋!
-         * 2.如果 楼栋存在表示查询单元
-         * 3.如果 单元存在表示查询楼层
-         * 4.如果 楼层存在表示查询户号
-         *
-         * 查询户号, 依赖于前面的查询条件成立!
-         *
-         * 这里的查询都依赖于, 前面的查询条件成立! 比如 要使用条件2, 那么条件1 必须成立!
-         *
-         */
-
-        List<TpBuildingOwnerInfo> selectList = tpBuildingOwnerInfoMapper.selectList(queryWrapper);
-
-        responseBean.addSuccess(selectList);
+    
+        List<TpPhase> tpPhaseList = tpPhaseMapper.selectList(queryWrapper);
+        responseBean.addSuccess(tpPhaseList);
 
         return responseBean;
     }
@@ -454,41 +419,92 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         //获取要上传的数据
         Map<String,Object> map = (Map<String, Object>) responseBean.getData();
         List<TpBuildingOwnerInfo> list = (List<TpBuildingOwnerInfo>) map.get("list");
-        list.stream().forEach(BuildingOwnerInfo -> {
-            BuildingOwnerInfo.setCommunityId(userElement.getCommunityId());
-            BuildingOwnerInfo.setVerifyStatus(Constant.UN_VERIFY_STATUS);
-            BuildingOwnerInfo.setCreateUser(userElement.getId());
-            BuildingOwnerInfo.setCreateDate(LocalDateTime.now());
-            BuildingOwnerInfo.setUpdateUser(userElement.getId());
-            BuildingOwnerInfo.setUpdateDate(LocalDateTime.now());
-        });
-        //批量插入
-	    tpBuildingOwnerInfoMapper.batchInsert(list);
-        //判断是否认证过
-        List<TpBuildingOwnerInfo> updateList = new ArrayList<TpBuildingOwnerInfo>();
-        List<TaUser> updataTaUserList = new ArrayList<TaUser>();
-        list.stream().forEach(BuildingOwnerInfo -> {
-            TaUser taUser = taUserMapper.selectByTel(BuildingOwnerInfo.getOwnerTel(),BuildingOwnerInfo.getCommunityId());
-            if (null != taUser){
-                BuildingOwnerInfo.setVerifyStatus(Constant.VERIFY_STATUS);
-                updateList.add(BuildingOwnerInfo);
-                taUser.setVerifyStatus(Constant.VERIFY_STATUS);
-                taUser.setBuildingOwnerInfoId(BuildingOwnerInfo.getId());
-                updataTaUserList.add(taUser);
-            }
-        });
+        
         //批量更新
-        if (updateList.size() > 0){
-	        tpBuildingOwnerInfoMapper.batchUpdate(updateList);
-        }
-        if (updataTaUserList.size() > 0){
-            taUserMapper.batchUpdate(updataTaUserList);
-            taUserMapper.batchUpdateRole(updataTaUserList);
+        tpBuildingOwnerInfoMapper.batchUpdate(list);
+        
+        //构造数据
+        for (TpBuildingOwnerInfo tpBuildingOwnerInfo : list){
+            //根据手机号查询这个手机号是否注册
+            TaUser taUser = taUserMapper.selectByTel(tpBuildingOwnerInfo.getOwnerTel());
+            if (null == taUser){
+                //插入新用户并审核通过
+                addNewUser(tpBuildingOwnerInfo,userElement);
+            }else {
+                //已经有用户的情况下看是否审核通过，是否要添加新的房产
+                checkUserVerify(taUser,tpBuildingOwnerInfo,userElement);
+            }
         }
         responseBean.addSuccess("success");
         return responseBean;
     }
-
+    
+    private void checkUserVerify(TaUser taUser, TpBuildingOwnerInfo tpBuildingOwnerInfo, UserElement userElement) {
+        //有用户的情况下查看是否有申请的房产
+        QueryWrapper<TaUserVerify> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("community_id",userElement.getCommunityId());
+        queryWrapper.eq("user_id",taUser.getId());
+        List<TaUserVerify> verifyList = taUserVerifyMapper.selectList(queryWrapper);
+        if (verifyList.size() > 0){
+            verifyList.stream().forEach(e -> {
+                if (e.getRoomNoId().equals(tpBuildingOwnerInfo.getId()) && e.getVerifyStatus().equals("0")){
+                    e.setVerifyStatus("1");
+                    e.setVerifyName(userElement.getUserName());
+                    taUserVerifyMapper.updateById(e);
+                }
+            });
+            return;
+        }
+        //插入一条房产数据
+        saveVerifyData(taUser.getId(),tpBuildingOwnerInfo,userElement);
+    }
+    
+    /**
+     * 插入新用户并审核通过
+     * @param tpBuildingOwnerInfo
+     * @param userElement
+     */
+    private void addNewUser(TpBuildingOwnerInfo tpBuildingOwnerInfo, UserElement userElement) {
+        //插入用户
+        TaUser taUser = new TaUser();
+        taUser.setUserName(tpBuildingOwnerInfo.getOwnerName());
+        taUser.setLoginName(tpBuildingOwnerInfo.getOwnerTel());
+        taUser.setStatus("1");
+        taUser.setCreateDate(LocalDateTime.now());
+        taUser.setFaceStatus("0");
+        taUserMapper.insert(taUser);
+        //审核通过
+        saveVerifyData(taUser.getId(),tpBuildingOwnerInfo,userElement);
+        
+    }
+    
+    private void saveVerifyData(Integer userId, TpBuildingOwnerInfo tpBuildingOwnerInfo, UserElement userElement) {
+        TaUserVerify taUserVerify = new TaUserVerify();
+        taUserVerify.setUserId(userId);
+        taUserVerify.setCommunityId(userElement.getCommunityId());
+        if (tpBuildingOwnerInfo.getRoleName().equals("户主")){
+            taUserVerify.setRoleId(1);
+        }else if (tpBuildingOwnerInfo.getRoleName().equals("家属")){
+            taUserVerify.setRoleId(3);
+        }else if (tpBuildingOwnerInfo.getRoleName().equals("租客")){
+            taUserVerify.setRoleId(2);
+        }
+        taUserVerify.setPhaseId(tpBuildingOwnerInfo.getPhaseId());
+        taUserVerify.setPhaseName(tpBuildingOwnerInfo.getPhaseName());
+        taUserVerify.setBuildingId(tpBuildingOwnerInfo.getBuildingId());
+        taUserVerify.setBuildingName(tpBuildingOwnerInfo.getBuildingName());
+        taUserVerify.setUnitId(tpBuildingOwnerInfo.getUnitId());
+        taUserVerify.setUnitName(tpBuildingOwnerInfo.getUnitName());
+        taUserVerify.setLevelId(tpBuildingOwnerInfo.getLevelId());
+        taUserVerify.setLevelName(tpBuildingOwnerInfo.getLevelName());
+        taUserVerify.setRoomNoId(tpBuildingOwnerInfo.getId());
+        taUserVerify.setRoomNoName(tpBuildingOwnerInfo.getName());
+        taUserVerify.setVerifyStatus("1");
+        taUserVerify.setCreateDate(LocalDateTime.now());
+        taUserVerify.setVerifyName(userElement.getUserName());
+        taUserVerifyMapper.insert(taUserVerify);
+    }
+    
     @Override
     public ResponseBean updataApprove(String paramets) {
         ResponseBean response = new ResponseBean();
@@ -556,48 +572,38 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             return responseBean;
         } else {
             List<String> temBuildingList = new ArrayList<String>();
-            List<String> temTelList = new ArrayList<String>();
             //获取一个sheet也就是一个工作簿
             Sheet sheet = workbook.getSheetAt(0);
             int lastRowNum = sheet.getLastRowNum();
             //从第一行开始第一行一般是标题
             for (int j = 3; j <= lastRowNum; j++) {
                 Row row = sheet.getRow(j);
-                TpBuildingOwnerInfo tpBuildingOwnerInfo = new TpBuildingOwnerInfo();
-                String phase = row.getCell(0).getStringCellValue().trim();
-                String building = row.getCell(1).getStringCellValue().trim();
-                String unit = row.getCell(2).getStringCellValue().trim();
-                String level = row.getCell(3).getStringCellValue().trim();
-                String roomNo = row.getCell(4).getStringCellValue().trim();
-                String ownerName = row.getCell(5).getStringCellValue().trim();
-                String ownerTel = row.getCell(6).getStringCellValue().trim();
+                String buildingInfo = row.getCell(0).getStringCellValue().trim();
+                String roomNoId = row.getCell(1).getStringCellValue().trim();
+                String ownerName = row.getCell(2).getStringCellValue().trim();
+                String ownerTel = row.getCell(3).getStringCellValue().trim();
+                String ownerRole = row.getCell(4).getStringCellValue().trim();
                 int currentRow = j+1;
-                if (StringUtils.isEmpty(phase)){
-                    responseBean.addError("第" + currentRow + "行" + "期/区不能为空!");
-                    return responseBean;
-                }
-                if (StringUtils.isEmpty(building)){
-                    responseBean.addError("第" + currentRow + "行" + "期/区不能为空!");
-                    return responseBean;
-                }
-                if (StringUtils.isEmpty(unit)){
-                    responseBean.addError("第" + currentRow + "行" + "期/区不能为空!");
+                if (StringUtils.isEmpty(buildingInfo)){
+                    responseBean.addError("第" + currentRow + "行" + "房产信息不能为空!");
                     return responseBean;
                 }
-                if (StringUtils.isEmpty(level)){
-                    responseBean.addError("第" + currentRow + "行" + "期/区不能为空!");
+                if (StringUtils.isEmpty(roomNoId)){
+                    responseBean.addError("第" + currentRow + "行" + "房产ID不能为空!");
                     return responseBean;
                 }
-                if (StringUtils.isEmpty(roomNo)){
-                    responseBean.addError("第" + currentRow + "行" + "期/区不能为空!");
+                //房产ID不为空的情况下检查房产是否存在
+                TpBuildingOwnerInfo checkOwnerInfo =tpBuildingOwnerInfoMapper.selectById(roomNoId);
+                if (null == checkOwnerInfo){
+                    responseBean.addError("第" + currentRow + "行" + "房产ID不存在!");
                     return responseBean;
                 }
                 if (StringUtils.isEmpty(ownerName)){
-                    responseBean.addError("第" + currentRow + "行" + "期/区不能为空!");
+                    responseBean.addError("第" + currentRow + "行" + "姓名不能为空!");
                     return responseBean;
                 }
                 if (StringUtils.isEmpty(ownerTel)){
-                    responseBean.addError("第" + currentRow + "行" + "期/区不能为空!");
+                    responseBean.addError("第" + currentRow + "行" + "手机号不能为空!");
                     return responseBean;
                 }
                 //校验手机号码
@@ -605,29 +611,25 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
                     responseBean.addError("第"+ currentRow +"行请输入正确手机号:" + ownerTel);
                     return responseBean;
                 }
-                String buildingInfo = phase + building + unit + level + roomNo;
-                if (temBuildingList.contains(buildingInfo)){
-                    logger.info("存在重复房源:{}",buildingInfo);
-                    responseBean.addError("第"+ currentRow +"行存在重复房源");
+                if (StringUtils.isEmpty(ownerRole)){
+                    responseBean.addError("第" + currentRow + "行" + "身份不能为空!");
                     return responseBean;
                 }
-                if (temTelList.contains(ownerTel)){
-                    logger.info("存在重复手机号:{}",ownerTel);
-                    responseBean.addError("第"+ currentRow +"行存在重复手机号");
+    
+                if (temBuildingList.contains(roomNoId)){
+                    logger.info("存在重复房源:{}",roomNoId);
+                    responseBean.addError("第"+ currentRow +"行存在重复房源");
                     return responseBean;
                 }
+                
                 //把数据塞入temList校验是否有重复的数据
-                temBuildingList.add(buildingInfo);
-                temTelList.add(ownerTel);
+                temBuildingList.add(roomNoId);
                 //构建数据
-                tpBuildingOwnerInfo.setPhaseName(phase);
-                tpBuildingOwnerInfo.setBuildingName(building);
-                tpBuildingOwnerInfo.setUnitName(unit);
-                tpBuildingOwnerInfo.setLevelName(level);
-                tpBuildingOwnerInfo.setName(roomNo);
-                tpBuildingOwnerInfo.setOwnerName(ownerName);
-                tpBuildingOwnerInfo.setOwnerTel(ownerTel);
-                list.add(tpBuildingOwnerInfo);
+                checkOwnerInfo.setRoleName(ownerRole);
+                checkOwnerInfo.setOwnerName(ownerName);
+                checkOwnerInfo.setOwnerTel(ownerTel);
+                checkOwnerInfo.setOwnerStatus("1");
+                list.add(checkOwnerInfo);
             }
         }
         //构建分页
@@ -876,8 +878,8 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         Long pages = infoIPage.getPages();
 
 
-        // 行数 默认从 第 5 行开始
-        int currentRow = 5;
+        // 行数 默认从 第 3 行开始
+        int currentRow = 3;
         // 记录坐标
         int index = 0;
 
@@ -926,4 +928,52 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         responseBean.addSuccess(workbook);
         return responseBean;
     }
+    
+    /**
+     * 获取楼栋信息
+     *
+     * @param phaseId
+     * @param communityId
+     * @return
+     */
+    @Override
+    public ResponseBean getBuildingList(Integer phaseId, Integer communityId) {
+        return null;
+    }
+    
+    /**
+     * 获取单元信息
+     *
+     * @param buildingId
+     * @param communityId
+     * @return
+     */
+    @Override
+    public ResponseBean getUnitList(Integer buildingId, Integer communityId) {
+        return null;
+    }
+    
+    /**
+     * 获取楼层信息
+     *
+     * @param unitId
+     * @param communityId
+     * @return
+     */
+    @Override
+    public ResponseBean getLevelList(Integer unitId, Integer communityId) {
+        return null;
+    }
+    
+    /**
+     * 获取室号信息
+     *
+     * @param levelId
+     * @param communityId
+     * @return
+     */
+    @Override
+    public ResponseBean getRoomNoList(Integer levelId, Integer communityId) {
+        return null;
+    }
 }

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

@@ -557,6 +557,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				tpBuildingOwnerInfoNew.setLevelName(lastLevelName);
 				tpBuildingOwnerInfoNew.setName(tpBuildingOwnerInfo.getName());
 				tpBuildingOwnerInfoNew.setCreateDate(LocalDateTime.now());
+				tpBuildingOwnerInfoNew.setTreeStatus("1");
 				tpBuildingOwnerInfoMapper.insert(tpBuildingOwnerInfoNew);
 			}
 		}

CODE/smart-community/property-api/src/main/resources/mapper/TaUserMapper.xml

@@ -315,7 +315,6 @@
     <include refid="Base_Column_List" />
     from ta_user
     where login_name = #{loginName,jdbcType=VARCHAR}
-    and community_id = #{communityId,jdbcType=INTEGER}
     and verify_status = 0
   </select>
 

CODE/smart-community/property-api/src/main/resources/mapper/TaUserVerifyMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.community.huiju.dao.TaUserVerifyMapper">
+
+</mapper>

CODE/smart-community/property-api/src/main/resources/mapper/TpBuildingOwnerInfoMapper.xml

@@ -50,9 +50,11 @@
         <foreach collection="list" item="item" index="index" open="" close="" separator=";">
             update tp_building_owner_info
             <set>
-                verify_status=${item.verifyStatus}
+                owner_name = #{item.ownerName},
+                owner_tel = #{item.ownerTel},
+                owner_status = #{item.ownerStatus}
             </set>
-            where id = ${item.id}
+            where id = #{item.id}
         </foreach>
     </update>
 

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

@@ -1,19 +1,48 @@
 import request from '@/utils/request'
 
 //  查询 楼栋/单元/楼层/户号
-export function buildingAddress(data) {
-  const config = {
-    url: '/building/address',
-    method: 'post',
-    data: {
-      phase: data.phase,
-      building: data.building,
-      unit: data.unit,
-      level: data.level,
-      roomNo: data.roomNo
-    }
-  }
-  return request(config)
+export function getPhaseList(data) {
+  return request({
+    url: '/building/phase',
+    method: 'get',
+    params: data
+  })
+}
+
+//  查询 楼栋/单元/楼层/户号
+export function getBuildingList(data) {
+  return request({
+    url: '/building/building',
+    method: 'get',
+    params: data
+  })
+}
+
+//  查询 楼栋/单元/楼层/户号
+export function getUnitList(data) {
+  return request({
+    url: '/building/unit',
+    method: 'get',
+    params: data
+  })
+}
+
+//  查询 楼栋/单元/楼层/户号
+export function getLevelList(data) {
+  return request({
+    url: '/building/level',
+    method: 'get',
+    params: data
+  })
+}
+
+//  查询 楼栋/单元/楼层/户号
+export function getRoomNoList(data) {
+  return request({
+    url: '/building/roomno',
+    method: 'get',
+    params: data
+  })
 }
 
 // 获取楼栋业主信息列表

VUECODE/smart-property-manage/src/store/modules/buildingOwnerInfo.js

@@ -1,6 +1,7 @@
 
 import { buildingAddress, buildingList, deleteBuilding, addBuilding, updateBuilding, getByIdBuildingId, userPassCertification, updataPassCertification, communityBuildinglist, buildingHouse, communityBuildingAdd, buildingDownloadExcel, addNode, deleteNode } from '@/api/buildingOwnerInfo'
 
+
 const buildingOwnerInfo = {
   state: {
     list: ''
@@ -11,9 +12,49 @@ const buildingOwnerInfo = {
     }
   },
   actions: {
-    BuildingAddress({ commit }, data) { // 查询 楼栋/单元/楼层/户号
+    GetPhaseList({ commit }, data) { // 查询 楼栋/单元/楼层/户号
+      return new Promise((resolve, reject) => {
+        getPhaseList(data).then(response => {
+          // console.log('查询 楼栋/单元/楼层/户号: ', response)
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    GetBuildingList({ commit }, data) { // 查询 楼栋/单元/楼层/户号
+      return new Promise((resolve, reject) => {
+        getBuildingList(data).then(response => {
+          // console.log('查询 楼栋/单元/楼层/户号: ', response)
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    GetUnitList({ commit }, data) { // 查询 楼栋/单元/楼层/户号
+      return new Promise((resolve, reject) => {
+        getUnitList(data).then(response => {
+          // console.log('查询 楼栋/单元/楼层/户号: ', response)
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    GetLevelList({ commit }, data) { // 查询 楼栋/单元/楼层/户号
+      return new Promise((resolve, reject) => {
+        getLevelList(data).then(response => {
+          // console.log('查询 楼栋/单元/楼层/户号: ', response)
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    GetRoomNoList({ commit }, data) { // 查询 楼栋/单元/楼层/户号
       return new Promise((resolve, reject) => {
-        buildingAddress(data).then(response => {
+        getRoomNoList(data).then(response => {
           // console.log('查询 楼栋/单元/楼层/户号: ', response)
           resolve(response)
         }).catch(error => {

VUECODE/smart-property-manage/src/views/building/batch/batchImport.vue

@@ -14,23 +14,26 @@
     </el-form>
     <el-table ref="multipleTable" :data="list" border tooltip-effect="dark" style="width: 100%; margin-top: 20px;">
       <el-table-column label="期/区" align="center">
-        <template slot-scope="scope">{{ scope.row.phase }}</template>
+        <template slot-scope="scope">{{ scope.row.phaseName }}</template>
       </el-table-column>
       <el-table-column label="栋" align="center">
-        <template slot-scope="scope">{{ scope.row.building }}</template>
+        <template slot-scope="scope">{{ scope.row.buildingName }}</template>
       </el-table-column>
       <el-table-column label="单元" align="center">
-        <template slot-scope="scope">{{ scope.row.unit }}</template>
+        <template slot-scope="scope">{{ scope.row.unitName }}</template>
       </el-table-column>
       <el-table-column label="楼层" align="center">
-        <template slot-scope="scope">{{ scope.row.level }}</template>
+        <template slot-scope="scope">{{ scope.row.levelName }}</template>
       </el-table-column>
       <el-table-column label="户号" align="center">
-        <template slot-scope="scope">{{ scope.row.roomNo }}</template>
+        <template slot-scope="scope">{{ scope.row.name }}</template>
       </el-table-column>
       <el-table-column label="业主姓名" align="center">
         <template slot-scope="scope">{{ scope.row.ownerName }}</template>
       </el-table-column>
+      <el-table-column label="身份" align="center">
+        <template slot-scope="scope">{{ scope.row.roleName }}</template>
+      </el-table-column>
       <el-table-column label="手机号码" align="center">
         <template slot-scope="scope">{{ scope.row.ownerTel }}</template>
       </el-table-column>

VUECODE/smart-property-manage/src/views/building/buildingdata/BuildingBatchImport.vue

@@ -4,7 +4,7 @@
     <el-form :inline="true" :model="listQuery" class="form-listQuery">
       <el-form-item>
         <el-upload :on-preview="handlePreview" :on-change="handleChange" :before-upload="beforeUpload" :limit="1" :on-exceed="handleExceed" class="upload-demo" action="" multiple>
-          <a href="http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/%E6%A5%BC%E6%A0%8B%E5%BA%93%E6%A8%A1%E6%9D%BF.xlsx?Expires=1548327771"><el-button style="margin-left: 10px;" size="large" type="primary">下载模板</el-button></a>
+          <a href="http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/%E6%A5%BC%E6%A0%8B%E5%BA%93%E6%A8%A1%E6%9D%BF.xlsx?Expires=1556098137"><el-button style="margin-left: 10px;" size="large" type="primary">下载模板</el-button></a>
           <el-button slot="trigger" size="large" type="primary">选取文件并预览</el-button>
           <el-button style="margin-left: 10px;" size="large" type="success" @click="submitUpload">提交</el-button>
           <el-button style="margin-left: 10px;" size="large" type="success" @click="dialogBuildingIndex">取消</el-button>

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

@@ -3,45 +3,45 @@
   <div class="root">
     <el-form :inline="true" :model="listQuery" class="form-listQuery">
       <el-form-item label="楼盘库">
-        <el-select v-model="listQuery.phase" placeholder="期/区" @change="buildSelectChange(0)">
+        <el-select v-model="listQuery.phaseId" placeholder="期/区" @change="buildSelectChange(0)">
           <!--<el-option label="选择楼栋" value="-1" />-->
           <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="listQuery.building" placeholder="栋" @change="buildSelectChange(1)">
+        <el-select v-model="listQuery.buildingId" placeholder="栋" @change="buildSelectChange(1)">
           <!--<el-option label="选择楼栋" value="-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="listQuery.unit" placeholder="单元" @change="buildSelectChange(2)">
+        <el-select v-model="listQuery.unitId" placeholder="单元" @change="buildSelectChange(2)">
           <!--<el-option label="选择单元" value="-1" />-->
           <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="listQuery.level" placeholder="楼层" @change="buildSelectChange(3)">
+        <el-select v-model="listQuery.levelId" placeholder="楼层" @change="buildSelectChange(3)">
           <!--<el-option label="选择楼层" value="-1" />-->
           <el-option
             v-for="item in levelList"
             :key="item.id"
-            :label="item.level"
-            :value="item.level"/>
+            :label="item.name"
+            :value="item.id"/>
         </el-select>
-        <el-select v-model="listQuery.roomNo" placeholder="户号">
+        <el-select v-model="listQuery.roomNoId" placeholder="户号">
           <!--<el-option label="选择户号" value="-1" />-->
           <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 label="业主名称">
           <el-input v-model="listQuery.ownerName" placeholder="业主名称" />
@@ -105,11 +105,11 @@ export default {
   data() {
     return {
       listQuery: {
-        phase: '',
-        building: '',
-        unit: '',
-        level: '',
-        roomNo: '',
+        phaseId: '',
+        buildingId: '',
+        unitId: '',
+        levelId: '',
+        roomNoId: '',
         ownerName: '',
         pageNum: 1,
         pageSize: 10
@@ -156,7 +156,11 @@ export default {
   },
   methods: {
     ...mapActions('buildingOwnerInfo', [
-      'BuildingAddress',
+      'GetPhaseList',
+      'GetBuildingList',
+      'GetUnitList',
+      'GetLevelList',
+      'GetRoomNoList',
       'BuildingInfoList'
     ]),
     handleSizeChange(val) {
@@ -185,15 +189,15 @@ export default {
     },
     getPhase() { // 获取期
       this.listQuery.phase = ''
-      this.$store.dispatch('BuildingAddress', this.listQuery).then((res) => {
+      this.$store.dispatch('GetPhaseList', this.listQuery).then((res) => {
         this.phaseList = res.data
       }).catch(() => {
         console.log('error phase BuildingAddress')
       })
     },
     getBuild() { // 获取楼栋
-      this.listQuery.building = ''
-      this.$store.dispatch('BuildingAddress', this.listQuery).then((res) => {
+      this.listQuery.buildingId = ''
+      this.$store.dispatch('GetBuildingList', this.listQuery).then((res) => {
         this.buildingList = res.data
       }).catch(() => {
         console.log('error building BuildingAddress')
@@ -201,7 +205,7 @@ export default {
     },
     getUnit() { // 获取单元
       this.listQuery.unit = ''
-      this.$store.dispatch('BuildingAddress', this.listQuery).then((res) => {
+      this.$store.dispatch('GetUnitList', this.listQuery).then((res) => {
         this.unitList = res.data
       }).catch(() => {
         console.log('error unit BuildingAddress')
@@ -209,7 +213,7 @@ export default {
     },
     getLevel() { // 获取楼层
       this.listQuery.level = ''
-      this.$store.dispatch('BuildingAddress', this.listQuery).then((res) => {
+      this.$store.dispatch('GetLevelList', this.listQuery).then((res) => {
         this.levelList = res.data
       }).catch(() => {
         console.log('error level BuildingAddress')
@@ -217,7 +221,7 @@ export default {
     },
     getRoomNo() { // 获取户号
       this.listQuery.roomNo = ''
-      this.$store.dispatch('BuildingAddress', this.listQuery).then((res) => {
+      this.$store.dispatch('GetRoomNoList', this.listQuery).then((res) => {
         this.roomNoList = res.data
       }).catch(() => {
         console.log('error roomNo BuildingAddress')

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

@@ -105,7 +105,7 @@ export default {
     }
   },
   mounted() {
-    this.ruleForm.id = this.$route.params.id
+    this.ruleForm.id = this.$route.query.id
     this.getById()
   },
   methods: {

VUECODE/smart-property-manage/src/views/social/activity/index.vue

@@ -240,7 +240,7 @@ export default {
       })
     },
     infoActivity(id) { // 查看活动
-      this.$router.push({ name: 'activity-info', params: { id: id }})
+      this.$router.push({ name: 'activity-info', query: { id: id }})
     },
     invalidActivity() { //  批量作废
       const ids = this.deleteIds

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

@@ -49,11 +49,12 @@ export default {
     }
   },
   mounted() {
-    this.getById(this.$route.params.id)
+    this.ruleForm.id = this.$route.query.id
+    this.getById()
   },
   methods: {
-    getById(id) { // 根据ID获取活动信息
-      this.$store.dispatch('ActivityById', id).then((res) => {
+    getById() { // 根据ID获取活动信息
+      this.$store.dispatch('ActivityById', this.ruleForm.id).then((res) => {
         const resData = res.data
         this.ruleForm = resData.info
         this.ruleForm.contentImg = resData.contentImg
@@ -80,10 +81,10 @@ export default {
       return year + '-' + month + '-' + day
     },
     ediActivity() { // 修改活动
-      this.$router.push({ name: 'activity-edi', params: { id: this.ruleForm.id }})
+      this.$router.push({ name: 'activity-edi', query: { id: this.ruleForm.id }})
     },
     lockSignUp() { // 查看活动报名
-      this.$router.push({ name: 'signUp-info', params: { id: this.ruleForm.id }})
+      this.$router.push({ name: 'signUp-info', query: { id: this.ruleForm.id }})
     }
   }
 }

VUECODE/smart-property-manage/src/views/social/announcement/details.vue

@@ -1,15 +1,24 @@
 <template>
   <div id="root">
-    <img :src="ruleForm.announcementCarouselImg" width="500" height="500">
-    <span class="activityTile">{{ ruleForm.announcementTitle }}</span>
-    <div class="activityContext">
-      {{ ruleForm.announcementContent }}
-    </div>
-    <div>
-      <template v-for="site in ruleForm.contentImg">
-        <img :src="site.url" width="500" height="500" >
-      </template>
-    </div>
+    <el-form ref="form" label-width="100px" label-position="left">
+      <el-form-item label="公共标题">
+        <span class="activityTile">{{ ruleForm.announcementTitle }}</span>
+      </el-form-item>
+      <el-form-item label="公告轮播图">
+        <span style="color: #99a9bf;">轮播图为横幅位展示图片，不会显示在公告详情页</span>
+        <img :src="ruleForm.announcementCarouselImg" width="100" height="100">
+      </el-form-item>
+      <el-form-item label="公告详细内容">
+        <div class="activityContext">
+          {{ ruleForm.announcementContent }}
+        </div>
+      </el-form-item>
+      <el-form-item label="公告配图">
+        <template v-for="site in ruleForm.contentImg">
+          <img :src="site.url" width="100" height="100" >
+        </template>
+      </el-form-item>
+    </el-form>
     <div class="bom-button">
       <el-button v-if="isEdi" type="primary" style="width: 150px;" @click="edi">修改</el-button>
     </div>
@@ -37,11 +46,11 @@ export default {
     }
   },
   mounted() {
-    this.getById(this.$route.params.id)
+    this.ruleForm.id = this.$route.query.id
+    this.getById()
   },
   methods: {
-    getById(id) { // 根据ID获取活动信息
-      this.ruleForm.id = this.$route.params.id
+    getById() { // 根据ID获取活动信息
       this.$store.dispatch('AnnouncementById', this.ruleForm).then((res) => {
         const resData = res.data
         const announcement = resData.tpAnnouncement
@@ -69,7 +78,7 @@ export default {
       return year + '-' + month + '-' + day
     },
     edi() { // 修改活动
-      this.$router.push({ name: 'announcement-edit', params: { id: this.ruleForm.id }})
+      this.$router.push({ name: 'announcement-edit', query: { id: this.ruleForm.id }})
     }
   }
 }
@@ -90,7 +99,7 @@ export default {
   margin-bottom: 10px;
 }
 .activityContext{
-  margin-top: 20px;
+  /*margin-top: 20px;*/
   margin-bottom: 20px;
   font-size: 20px;
   justify-items: center;

VUECODE/smart-property-manage/src/views/social/announcement/edit.vue

@@ -76,11 +76,12 @@ export default {
       }
     }
   },
-    mounted() {
-    this.getById(this.$route.params.id)
+  mounted() {
+    this.ruleForm.id = this.$route.query.id
+    this.getById()
   },
   methods: {
-    submitForm(formName,status) {
+    submitForm(formName, status) {
       // 加载框
       const loading = this.$loading({
         lock: true,
@@ -93,11 +94,10 @@ export default {
           if (this.ruleForm.announcementContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
             this.$message.error('公告内容描述 和 公告配图至少要存在一个!')
             loading.close()
-            return 
+            return
           }
           this.ruleForm.status = status // 发布状态
           this.$store.dispatch('Updateannouncement', this.ruleForm).then((res) => {
-
             if (res.code === '0') {
               this.$message({
                 message: res.message,
@@ -118,7 +118,7 @@ export default {
           return false
         }
       })
-       // 关闭加载框
+      // 关闭加载框
       loading.close()
     },
     handleAvatarSuccess(res, file) { // 轮播图上传回调
@@ -156,15 +156,14 @@ export default {
     sortHandleChange(value) { // 权重值
       this.ruleForm.sort = value
     },
-    getById(id) { // 页面初始化后调用此方法根据ID获取公告信息
-      this.ruleForm.id=this.$route.params.id
+    getById() { // 页面初始化后调用此方法根据ID获取公告信息
       this.$store.dispatch('AnnouncementById', this.ruleForm).then((res) => {
-      const resData = res.data
-      this.ruleForm.announcementTitle=resData.tpAnnouncement.announcementTitle// 标题
-      this.ruleForm.announcementContent=resData.tpAnnouncement.announcementContent// 内容
-      this.Urlimage=resData.tpAnnouncement.announcementCarouselImg // 轮播图
-      this.ruleForm.sort=resData.tpAnnouncement.sort// 权重
-        //多张图片进行遍历
+        const resData = res.data
+        this.ruleForm.announcementTitle = resData.tpAnnouncement.announcementTitle// 标题
+        this.ruleForm.announcementContent = resData.tpAnnouncement.announcementContent// 内容
+        this.Urlimage = resData.tpAnnouncement.announcementCarouselImg // 轮播图
+        this.ruleForm.sort = resData.tpAnnouncement.sort// 权重
+        // 多张图片进行遍历
         for (let i = 0; i < resData.studentList.length; i++) {
           this.contentImgList.push({ url: resData.studentList[i].imageUrl })
           this.ruleForm.contentImg.push(resData.studentList[i].imageUrl)

VUECODE/smart-property-manage/src/views/social/announcement/index.vue

@@ -228,7 +228,7 @@ export default {
 
 
     clickTitle(id) {
-      this.$router.push({ name: 'contentParticulars-details', params: { id: id }})
+      this.$router.push({ name: 'contentParticulars-details', query: { id: id }})
     },
     formatDate(val) {
       if (val === null) {

VUECODE/smart-property-manage/src/views/social/signUp/index.vue

@@ -129,7 +129,7 @@ export default {
     }
   },
   mounted() {
-    this.listQuery.id = this.$route.params.id
+    this.listQuery.id = this.$route.query.id
     this.signUpList()
   },
   methods: {