合并

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

@@ -284,38 +284,28 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 //            return responseBean;
 //        }
 
+        // 校验 期/区/栋/单元/楼层/户号
+        QueryWrapper<TpRoomNo> roomNoQueryWrapper = new QueryWrapper<>();
+        roomNoQueryWrapper.eq("community_id", userElement.getCommunityId());
+        roomNoQueryWrapper.eq("phase_id", phase);
+        roomNoQueryWrapper.eq("building_id", building);
+        roomNoQueryWrapper.eq("unit_id", unit);
+        roomNoQueryWrapper.eq("level_id", level);
+        roomNoQueryWrapper.eq("id", roomNo);
+        TpRoomNo tpRoomNo = tpRoomNoMapper.selectOne(roomNoQueryWrapper);
+        if (null == tpRoomNo) {
+            responseBean.addError("房产不存在！");
+            return responseBean;
+        }
+
+
         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);
@@ -323,6 +313,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
         billInvoice.setBillStatus("0");
         billInvoice.setCreateUser(userElement.getId());
         billInvoice.setCreateDate(new Date());
+        billInvoice.setRoomNoId(roomNo);
         billInvoice.setStatus(0);
 
         int result = billInvoiceMapper.insert(billInvoice);

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

@@ -121,7 +121,9 @@ public class HotelServiceImpl extends ServiceImpl<HotelMapper, Hotel> implements
                 .setHotelId(hotel.getId())
                 .setPrice(String.valueOf(hotelRoom.getPrice()))
                 .setCreateDate(LocalDateTime.now())
-                .setCreateUser(userElement.getId());
+                .setCreateUser(userElement.getId())
+                .setUpdateDate(LocalDateTime.now())
+                .setUpdateUser(userElement.getId());
         tpHotelRoomMapper.insert(hotelRoom);
         response.addSuccess("成功");
         return response;

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

@@ -67,11 +67,11 @@
           {{ scope.row.phase + scope.row.building + scope.row.unit + scope.row.roomNo }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="ownerName"
-        label="户主姓名"
-        align="center"
-        width="180"/>
+      <!--<el-table-column-->
+        <!--prop="ownerName"-->
+        <!--label="户主姓名"-->
+        <!--align="center"-->
+        <!--width="180"/>-->
       <el-table-column
         prop="billInvoiceExplain"
         align="center"