提交

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/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);
     
     /**
      * 获取账单的详细信息

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/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/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/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">