合并

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

@@ -43,8 +43,8 @@ public class HkController {
 		return hkResponseBean;
 	}
 
-	@RequestMapping(value = "推送HK人员", method = RequestMethod.POST)
-	public ResponseBean pushHKPerson(@RequestParam("appUserId") String appUserId) {
+	@RequestMapping(value = "/pushHKPerson/{appUserId}", method = RequestMethod.POST)
+	public ResponseBean pushHKPerson(@PathVariable("appUserId") String appUserId) {
 		ResponseBean responseBean = new ResponseBean();
 		responseBean = ihkService.pushPerson(appUserId);
 		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 buildingOwnerInfoId
+     * @param roomNoId 房间id
      * @param payType
      * @return
      */
-    List<Map<String, Object>> getBillsList(@Param("communityId") Integer communityId,@Param("buildingOwnerInfoId") Integer buildingOwnerInfoId,@Param("payType") Integer payType);
+    List<Map<String, Object>> getBillsList(@Param("communityId") Integer communityId,@Param("roomNoId") Integer roomNoId,@Param("payType") Integer payType);
     
     /**
      * 获取账单的详细信息

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

@@ -54,24 +54,20 @@ public class BillServiceImpl implements BillServiceI {
 		 * 账单 关联的是房产,
  		 */
 
-		/**
-		 * 获取这个房产的业主
-		 */
-
-		TaUserVerify userVerify = taUserVerifyMapper.selectCommunityAndAddressAndRoleId(userElement.getCommunityId(),
-										userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(),
-										userElement.getLevelId(), userElement.getRoomNoId());
-		// 业主信息
-		TaUser user = taUserMapper.selectByPrimaryKey(userVerify.getUserId());
-
-		TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityAndAddressAndPhone(userElement.getCommunityId(),
-				userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(),
-				userElement.getLevelId(), userElement.getRoomNoId(), user.getLoginName());
+//		TaUserVerify userVerify = taUserVerifyMapper.selectCommunityAndAddressAndRoleId(userElement.getCommunityId(),
+//										userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(),
+//										userElement.getLevelId(), userElement.getRoomNoId());
+//		// 业主信息
+//		TaUser user = taUserMapper.selectByPrimaryKey(userVerify.getUserId());
+//
+//		TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityAndAddressAndPhone(userElement.getCommunityId(),
+//				userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(),
+//				userElement.getLevelId(), userElement.getRoomNoId(), user.getLoginName());
 
 
 		//使用分页插件
 		Page<Map<String,Object>> page = PageHelper.startPage(pageNum, pageSize);
-		List<Map<String,Object>> billsList = tpBillInvoiceMapper.getBillsList(userElement.getCommunityId(), tpBuildingOwnerInfo.getId(), payType);
+		List<Map<String,Object>> billsList = tpBillInvoiceMapper.getBillsList(userElement.getCommunityId(), userElement.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/HKServiceImpl.java

@@ -70,7 +70,6 @@ public class HKServiceImpl implements IHKService {
             return responseBean;
         }
         responseBean.addError("操作失败!");
-        responseBean.addError("操作失败!");
         return responseBean;
     }
 

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.building_owner_info_id = #{buildingOwnerInfoId,jdbcType=INTEGER}
+          AND i.room_no_id = #{roomNoId,jdbcType=INTEGER}
   </select>
 
   <select id="getBillInvoiceDetail" resultType="map">

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

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.community.huiju.model.TaUserVerify;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultType;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -40,6 +42,28 @@ public interface TaUserVerifyMapper extends BaseMapper<TaUserVerify> {
      * @param roomNoId
      * @return
      */
-    TaUserVerify selectCommunityAndAddress(Integer communityId,Integer phaseId,Integer buildingId, Integer unitId,Integer levelId,Integer roomNoId);
+    TaUserVerify selectCommunityAndAddress(@Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId, @Param("buildingId") Integer buildingId, @Param("unitId") Integer unitId, @Param("levelId") Integer levelId, @Param("roomNoId") Integer roomNoId);
+
+    /**
+     * 根据 小区id 、 小区、期、栋、单元、楼层、户号 进行条件查询出 已审核通过的并且是业主
+     * @param communityId
+     * @param phaseName
+     * @param buildingName
+     * @param unitName
+     * @param levelName
+     * @param roomNoName
+     * @return
+     */
+    @ResultType(TaUserVerify.class)
+    @Select("select  *  from ta_user_verify " +
+            "where community_id = #{communityId} " +
+            "and phase_name = #{phaseName} " +
+            "and building_name = #{buildingName} " +
+            "and unit_name = #{unitName} " +
+            "and level_name = #{levelName} " +
+            "and room_no_name = #{roomNoName} " +
+            "and verify_status = 1 " +
+            "and role_id = 1")
+    TaUserVerify selectCommunityAndAddressName(@Param("communityId") Integer communityId, @Param("phaseName") String phaseName, @Param("buildingName") String buildingName, @Param("unitName") String unitName, @Param("levelName") String levelName, @Param("roomNoName") String roomNoName);
 
 }

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

@@ -55,4 +55,29 @@ public interface TpBuildingOwnerInfoMapper extends BaseMapper<TpBuildingOwnerInf
             "AND tpio.room_no_id = #{roomNoId} " +
             "AND tpio.owner_tel = #{ownerTel}")
     TpBuildingOwnerInfo selectCommunityIdAndAddress(@Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId, @Param("buildingId") Integer buildingId, @Param("unitId") Integer unitId, @Param("levelId") Integer levelId, @Param("roomNoId") Integer roomNoId, @Param("ownerTel") String ownerTel);
+
+
+    /**
+     * 更具 小区、期、楼栋、单元、楼层、户号、手机号 查询
+     * @param communityId
+     * @param phaseName
+     * @param buildingName
+     * @param unitName
+     * @param levelName
+     * @param roomNoName
+     * @param ownerTel
+     * @return
+     */
+    @ResultType(TpBuildingOwnerInfo.class)
+    @Select("select * FROM tp_building_owner_info tpio " +
+            "WHERE tpio.community_id = #{communityId} " +
+            "and tpio.phase_name = #{phaseName} " +
+            "and tpio.building_name = #{buildingName} " +
+            "and tpio.unit_name = #{unitName} " +
+            "and tpio.level_name = #{levelName} " +
+            "AND tpio.room_no_name = #{roomNoName} " +
+            "AND tpio.owner_tel = #{ownerTel}")
+    TpBuildingOwnerInfo selectCommunityIdAndAddress(@Param("communityId") Integer communityId, @Param("phaseName") String phaseName, @Param("buildingName") Integer buildingName, @Param("unitName") Integer unitName, @Param("levelName") Integer levelName, @Param("roomNoName") Integer roomNoName, @Param("ownerTel") String ownerTel);
+
+
 }

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

@@ -3,6 +3,9 @@ package com.community.huiju.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.community.huiju.model.TpRoomNo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultType;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * <p>
@@ -15,4 +18,26 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TpRoomNoMapper extends BaseMapper<TpRoomNo> {
 
+
+    /**
+     * 根据 小区，期，栋，单元，楼层，房间  查询房间信息
+     * @param communityId
+     * @param phaseName
+     * @param buildingName
+     * @param unitName
+     * @param levelName
+     * @param roomNoName
+     * @return
+     */
+    @ResultType(TpRoomNo.class)
+    @Select("select * from tp_room_no " +
+            "where community_id = #{communityId} " +
+            "and phase_name = #{phaseName} " +
+            "and building_name = #{buildingName} " +
+            "and unit_name = #{unitName} " +
+            "and level_name = #{levelName} " +
+            "and name = #{roomNoName}")
+    TpRoomNo selectCommunityIdAndAddressName(@Param("communityId") Integer communityId, @Param("phaseName") String phaseName, @Param("buildingName") String buildingName, @Param("unitName") String unitName, @Param("levelName") String levelName, @Param("roomNoName") String roomNoName);
+
+
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/feign/TaUserFeignService.java

@@ -3,6 +3,7 @@ package com.community.huiju.feign;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.feign.impl.TaUserFeignFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -21,4 +22,12 @@ public interface TaUserFeignService {
     @RequestMapping(value = "/user/register",method = RequestMethod.POST)
     ResponseBean register(@RequestBody String parameter);
 
+    /**
+     * 推送海康人员添加
+     * @param appUserId
+     * @return
+     */
+    @RequestMapping(value = "/pushHKPerson/{appUserId}", method = RequestMethod.POST)
+    ResponseBean pushHKPerson(@PathVariable("appUserId") Integer appUserId);
+
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/feign/impl/TaUserFeignFallBack.java

@@ -9,6 +9,15 @@ public class TaUserFeignFallBack implements TaUserFeignService {
 
     @Override
     public ResponseBean register(String parameter) {
+        return back();
+    }
+
+    @Override
+    public ResponseBean pushHKPerson(Integer appUserId) {
+        return back();
+    }
+
+    private ResponseBean back() {
         log.error("app-api 远端服务请求失败！");
         ResponseBean responseBean = new ResponseBean();
         responseBean.addError("app-api 远端服务请求失败！");

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

@@ -119,6 +119,11 @@ public class BillInvoice implements Serializable {
      */
     private String payType;
 
+    /**
+     * 房间id，账单最终绑定到房间号下
+     */
+    private Integer roomNoId;
+
     /**
      * 业主姓名
      */

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

@@ -60,6 +60,12 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
     @Autowired
     private IMessageService iMessageService;
 
+    @Autowired
+    private TpRoomNoMapper tpRoomNoMapper;
+
+    @Autowired
+    private TaUserVerifyMapper taUserVerifyMapper;
+
     @Override
     public ResponseBean getBillList(String parameter, UserElement userElement) {
         ResponseBean responseBean = new ResponseBean();
@@ -187,7 +193,6 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
                 billInvoice.setBillStatementId(billStatement.getId());
                 billInvoice.setPayName(billStatement.getPayName());
                 billInvoice.setPayDate(new Date());
-                billInvoice.setOutTradeNo(String.valueOf(System.currentTimeMillis()) + billInvoice.getId());
                 billInvoiceMapper.updateById(billInvoice);
 
                 // 修改缴费户数
@@ -231,13 +236,15 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
         // 收费项ID
         Integer billId = jsonObject.getInteger("billId");
         // 区/期
-        String phase = jsonObject.getString("phase");
+        Integer phase = jsonObject.getInteger("phase");
         // 栋
-        String building = jsonObject.getString("building");
+        Integer building = jsonObject.getInteger("building");
         // 单元
-        String unit = jsonObject.getString("unit");
+        Integer unit = jsonObject.getInteger("unit");
+        // 楼层
+        Integer level = jsonObject.getInteger("level");
         // 户号
-        String roomNo = jsonObject.getString("roomNo");
+        Integer roomNo = jsonObject.getInteger("roomNo");
         // 催缴日期
         // Date worthOf = jsonObject.getDate("worthOf");
         // 收费单说明
@@ -253,39 +260,48 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 //            return responseBean;
 //        }
 
-        // 楼栋资料库
-        QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("phase", phase);
-        queryWrapper.eq("building", building);
-        queryWrapper.eq("unit", unit);
-        queryWrapper.eq("room_no", roomNo);
-        queryWrapper.eq("community_id", userElement.getCommunityId());
-        TpBuildingOwnerInfo buildingOwnerInfo = tpBuildingOwnerInfoMapper.selectOne(queryWrapper);
-
-        // 查询app用户id
-        QueryWrapper<TaUser> userQueryWrapper = new QueryWrapper<>();
-        userQueryWrapper.eq("community_id", userElement.getCommunityId());
-        userQueryWrapper.eq("login_name", buildingOwnerInfo.getOwnerTel());
-        TaUser taUser = taUserMapper.selectOne(userQueryWrapper);
-
         BillInvoice billInvoice = new BillInvoice();
+
+        /**
+         * 缴费单挂靠在 房产下面
+         */
+
+        /**
+         * 需要知道这个房产的业主
+         */
+        TaUserVerify userVerify = taUserVerifyMapper.selectCommunityAndAddress(userElement.getCommunityId(), phase, building, unit, level, roomNo);
+
+        TaUser ownerUser = null;
+        TpBuildingOwnerInfo buildingOwnerInfo = null;
+        if (null != userVerify) {
+            // 业主个人信息
+            ownerUser = taUserMapper.selectById(userVerify.getUserId());
+
+            // 楼栋资料库
+            buildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(userElement.getCommunityId(),
+                    userVerify.getPhaseId(), userVerify.getBuildingId(), userVerify.getUnitId(),
+                    userVerify.getLevelId(), userVerify.getRoomNoId(), ownerUser.getLoginName());
+            if (null == buildingOwnerInfo) {
+                throw new WisdomException("手机号为：" + ownerUser.getLoginName() + " 楼栋业主资料不存在！");
+            }
+            billInvoice.setBuildingOwnerInfoId(buildingOwnerInfo.getId());
+        }
+
+        if (null != ownerUser) {
+            billInvoice.setTaUserId(ownerUser.getId());
+        }
+        // 设置房号
+        billInvoice.setRoomNoId(roomNo);
         billInvoice.setBillId(billId);
         billInvoice.setCommunityId(userElement.getCommunityId());
         billInvoice.setBillInvoiceExplain(billInvoiceExplain);
         billInvoice.setPayPrice(PayPriceUtils.yuanConversionPoints(payPrice));
-        billInvoice.setBuildingOwnerInfoId(buildingOwnerInfo.getId());
-        if (null != taUser) {
-            billInvoice.setTaUserId(taUser.getId());
-        }
         billInvoice.setBillStatus("0");
         billInvoice.setCreateUser(userElement.getId());
         billInvoice.setCreateDate(new Date());
         billInvoice.setStatus(0);
-        billInvoice.setOutTradeNo("");
 
         int result = billInvoiceMapper.insert(billInvoice);
-        billInvoice.setOutTradeNo(String.valueOf(System.currentTimeMillis()) + billInvoice.getId());
-        result = billInvoiceMapper.updateById(billInvoice);
         if (result <= 0) {
             throw new WisdomException("添加失败");
         }
@@ -552,11 +568,14 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
         List<BillInvoice> records = billInvoiceIPage.getRecords();
         records.forEach(e->{
             TpBuildingOwnerInfo buildingOwnerInfo = tpBuildingOwnerInfoMapper.selectById(e.getBuildingOwnerInfoId());
-            e.setOwnerName(buildingOwnerInfo.getOwnerName());
-            e.setPhase(buildingOwnerInfo.getPhaseName());
-            e.setBuilding(buildingOwnerInfo.getBuildingName());
-            e.setUnit(buildingOwnerInfo.getUnitName());
-            e.setLevel(buildingOwnerInfo.getLevelName());
+            if (null != buildingOwnerInfo) {
+                e.setOwnerName(buildingOwnerInfo.getOwnerName());
+            }
+            TpRoomNo tpRoomNo = tpRoomNoMapper.selectById(e.getRoomNoId());
+            e.setPhase(tpRoomNo.getPhaseName());
+            e.setBuilding(tpRoomNo.getBuildingName());
+            e.setUnit(tpRoomNo.getUnitName());
+            e.setLevel(tpRoomNo.getLevelName());
         });
 
         Map<String, Object> map = Maps.newHashMap();

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

@@ -91,6 +91,12 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
     @Autowired
     private IMessageService iMessageService;
 
+    @Autowired
+    private TaUserVerifyMapper taUserVerifyMapper;
+
+    @Autowired
+    private TpRoomNoMapper tpRoomNoMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean updateBillNameAndBillExplainAndEndDate(UserElement userElement, String parameter) {
@@ -331,46 +337,48 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                 billInvoice.setCommunityId(userElement.getCommunityId());
                 billInvoice.setBillId(bill.getId());
 
+                // 根据 小区，期，栋，单元，楼层，房号 -》 查询房号id
+                // 因为和房间关联
+
                 /**
                  * 需要知道这个房产的业主
                  */
-                // 楼栋资料库
-                QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("phase_id", e.getPhase());
-                queryWrapper.eq("building_id", e.getBuilding()); 
-                queryWrapper.eq("unit_id", e.getUnit());
-                queryWrapper.eq("level_id", e.getLevel());
-                queryWrapper.eq("room_no_id", e.getRoomNo());
-                queryWrapper.eq("community_id", userElement.getCommunityId());
-                TpBuildingOwnerInfo buildingOwnerInfo = tpBuildingOwnerInfoMapper.selectOne(queryWrapper);
-                if (null == buildingOwnerInfo) {
-                    throw new WisdomException("请输入正确的用户信息! ");
+                TaUserVerify userVerify = taUserVerifyMapper.selectCommunityAndAddressName(userElement.getCommunityId(), e.getPhase(), e.getBuilding(), e.getUnit(), e.getLevel(), e.getRoomNo());
+
+                TaUser ownerUser = null;
+                TpBuildingOwnerInfo buildingOwnerInfo = null;
+                if (null != userVerify) {
+                    // 业主个人信息
+                    ownerUser = taUserMapper.selectById(userVerify.getUserId());
+
+                    // 楼栋资料库
+                    buildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(userElement.getCommunityId(),
+                                                userVerify.getPhaseId(), userVerify.getBuildingId(), userVerify.getUnitId(),
+                                                userVerify.getLevelId(), userVerify.getRoomNoId(), ownerUser.getLoginName());
+                    if (null == buildingOwnerInfo) {
+                        throw new WisdomException("手机号为：" + ownerUser.getLoginName() + " 楼栋业主资料不存在！");
+                    }
+                    billInvoice.setBuildingOwnerInfoId(buildingOwnerInfo.getId());
+
                 }
 
                 /**
-                 * 如果用户不在 app 里面,没有关联, 那么就设置 taUserId
-                 * 等业主第一次登陆的时候, 再去自动匹配上去
+                 * 查询房号
                  */
-
-                // 查询app用户id
-                QueryWrapper<TaUser> userQueryWrapper = new QueryWrapper<>();
-                userQueryWrapper.eq("community_id", userElement.getCommunityId());
-                userQueryWrapper.eq("login_name", buildingOwnerInfo.getOwnerTel());
-                TaUser taUser = taUserMapper.selectOne(userQueryWrapper);
-
-                billInvoice.setBuildingOwnerInfoId(buildingOwnerInfo.getId());
-                if (null != taUser) {
-                    billInvoice.setTaUserId(taUser.getId());
+                TpRoomNo tpRoomNo = tpRoomNoMapper.selectCommunityIdAndAddressName(userElement.getCommunityId(), e.getPhase(), e.getBuilding(), e.getUnit(), e.getLevel(), e.getRoomNo());
+                if (null == tpRoomNo) {
+                    throw new WisdomException("房产：" + e.getPhase() + e.getBuilding() + e.getUnit() + e.getLevel() + e.getRoomNo() + " 不存在！请核对！");
                 }
+                if (null != ownerUser) {
+                    billInvoice.setTaUserId(ownerUser.getId());
+                }
+                billInvoice.setRoomNoId(tpRoomNo.getId());
                 billInvoice.setBillInvoiceExplain(e.getBillExplain());
                 billInvoice.setPayPrice(e.getPayPrice());
                 billInvoice.setBillStatus("0");
                 billInvoice.setCreateUser(userElement.getId());
                 billInvoice.setCreateDate(new Date());
                 billInvoice.setStatus(1);
-//                Random random = new Random();
-//                billInvoice.setOutTradeNo(String.valueOf(System.currentTimeMillis()) + random.nextInt());
-
 
                 return billInvoice;
             }).collect(Collectors.toList());

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

@@ -107,6 +107,9 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     @Autowired
     @Qualifier("phoneCodeImpl")
     private ICode iCode;
+
+    @Autowired
+    private TaUserFeignService taUserFeignService;
     
     public static final Logger logger = LoggerFactory.getLogger(BuildingOwnerInfoServiceImpl.class);
     
@@ -184,6 +187,11 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             insertTpBuildingOwnerInfo(userVerify.getPhaseId(), userVerify.getBuildingId(), userVerify.getUnitId(),
                     userVerify.getLevelId(), userVerify.getRoomNoId(), userElement.getCommunityId(), userElement.getId(),
                     userVerify.getGender(), user.getUserName(), user.getLoginName());
+            // 推送海康
+            ResponseBean pushHKPerson = taUserFeignService.pushHKPerson(userVerify.getUserId());
+            if (!"0".equals(pushHKPerson.getCode())) {
+                throw new WisdomException("设备推送失败！");
+            }
         }
 
 

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

@@ -8,6 +8,8 @@ import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.dao.*;
+import com.community.huiju.exception.WisdomException;
+import com.community.huiju.feign.TaUserFeignService;
 import com.community.huiju.model.*;
 import com.community.huiju.service.ITaUserVerifyService;
 import org.apache.commons.lang.StringUtils;
@@ -54,6 +56,9 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
     @Autowired
     private TpRoomNoMapper tpRoomNoMapper;
 
+    @Autowired
+    private TaUserFeignService taUserFeignService;
+
     @Override
     public ResponseBean selectAll(String phone, String userName, String idCard, Integer pageNum, Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
@@ -173,6 +178,11 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
                 // 添加楼栋数据
                 insertBuildingOwnerInfo(userVerify, user);
             }
+            // 推送海康
+            ResponseBean pushHKPerson = taUserFeignService.pushHKPerson(userVerify.getUserId());
+            if (!"0".equals(pushHKPerson.getCode())) {
+                throw new WisdomException("设备推送失败！");
+            }
         }
         taUserVerifyMapper.updateById(userVerify);
 

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

@@ -7,30 +7,31 @@
         SELECT
             tpi.*,
             tboi.owner_name as ownerName,
-            tboi.phase as phase,
-            tboi.building as building,
-            tboi.unit as unit,
-            tboi.room_no as roomNo,
-            tpi.out_trade_no as billStatement,
+            tpro.phase_name as phase,
+            tpro.building_name as building,
+            tpro.unit_name as unit,
+            tpro.name as roomNo,
+            tpbo.order_bumber as billStatement,
             (SELECT user_name from tp_user tu WHERE tu.id = tpi.create_user) as createUserName,
             (SELECT user_name from tp_user tu WHERE tu.id = tpi.update_user) as updateUserName
         FROM
           tp_bill_invoice tpi
+        LEFT JOIN tp_room_no tpro ON tpi.room_no_id = tpro.id
+        LEFT JOIN tp_bill_order tpbo ON tpi.id = tpbo.tp_bill_invoice_id
         LEFT JOIN tp_building_owner_info tboi ON tpi.building_owner_info_id = tboi.id
-        LEFT JOIN tp_bill_statement tbs ON tpi.bill_statement_id = tbs.id
         <where>
             <trim prefixOverrides="and | or">
                 <if test="map.phase != null and map.phase != ''">
-                    AND tboi.phase = #{map.phase}
+                    AND tpro.phase_id = #{map.phase}
                 </if>
                 <if test="map.building != null and map.building != ''">
-                    AND tboi.building = #{map.building}
+                    AND tpro.building_id = #{map.building}
                 </if>
                 <if test="map.unit != null and map.unit != ''">
-                    AND tboi.unit = #{map.unit}
+                    AND tpro.unit_id = #{map.unit}
                 </if>
                 <if test="map.roomNo != null and map.roomNo != ''">
-                    AND tboi.room_no = #{map.roomNo}
+                    AND tpro.room_no_id = #{map.roomNo}
                 </if>
                 <if test="map.ownerName != null and map.ownerName != ''">
                     AND tboi.owner_name like CONCAT('%',#{map.ownerName},'%')
@@ -59,14 +60,14 @@
         SELECT
         tpi.*,
         tboi.owner_name as ownerName,
-        tboi.phase as phase,
-        tboi.building as building,
-        tboi.unit as unit,
-        tboi.room_no as roomNo
+        tprn.phase_name as phase,
+        tprn.building_name as building,
+        tprn.unit_name as unit,
+        tprn.name as roomNo
         FROM
         tp_bill_invoice tpi
-        LEFT JOIN tp_building_owner_info tboi ON tpi.building_owner_info_id = tboi.id
-        LEFT JOIN tp_bill_statement tbs ON tpi.bill_statement_id = tbs.id
+        LEFT JOIN tp_room_no tprn ON tpi.room_no_id = tprn.id
+        LEFT JOIN tp_building_owner_info tboi ON tpi.bill_statement_id = tboi.id
         <where>
             <trim prefixOverrides="and | or">
                 <if test="map.billId != null">
@@ -79,7 +80,6 @@
             </trim>
         </where>
         order by tpi.create_date DESC
-
     </select>
 
     <select id="selectBillInvoiceEffective" resultType="com.community.huiju.model.BillInvoice">
@@ -87,17 +87,18 @@
         SELECT
         tpi.*,
         tboi.owner_name as ownerName,
-        tboi.phase as phase,
-        tboi.building as building,
-        tboi.unit as unit,
-        tboi.room_no as roomNo,
-        tbs.id as billStatement,
+        tpro.phase_name as phase,
+        tpro.building_name as building,
+        tpro.unit_name as unit,
+        tpro.name as roomNo,
+        tpbo.order_bumber as billStatement,
         (SELECT user_name from tp_user tu WHERE tu.id = tpi.create_user) as createUserName,
         (SELECT user_name from tp_user tu WHERE tu.id = tpi.update_user) as updateUserName
         FROM
         tp_bill_invoice tpi
+        LEFT JOIN tp_room_no tpro ON tpi.room_no_id = tpro.id
+        LEFT JOIN tp_bill_order tpbo ON tpi.id = tpbo.tp_bill_invoice_id
         LEFT JOIN tp_building_owner_info tboi ON tpi.building_owner_info_id = tboi.id
-        LEFT JOIN tp_bill_statement tbs ON tpi.bill_statement_id = tbs.id
         <where>
             <trim prefixOverrides="and | or">
                 <if test="map.billId != null">

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

@@ -70,6 +70,7 @@ export function addTempBillInvoice(data) {
       phase: data.phaseId, // 期/区
       building: data.buildingId, // 栋
       unit: data.unitId, // 单元
+      level: data.levelId, // 楼层
       roomNo: data.roomNoId, // 户号
       worthOf: data.worthOf, // 催缴日期
       billInvoiceExplain: data.billInvoiceExplain, // 收费单说明

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

@@ -139,11 +139,11 @@ export default {
         this.$message.error('栋')
         return
       }
-      // if (this.formInline.building === '') {
-      //   this.$message.error('单元')
-      //   return
-      // }
       if (this.formInline.unit === '') {
+        this.$message.error('单元')
+        return
+      }
+      if (this.formInline.levelId === '') {
         this.$message.error('楼层')
         return
       }

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

@@ -124,7 +124,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        prop="outTradeNo"
+        prop="billStatement"
         label="订单号"
         align="center" width="170"/>
       <el-table-column