From b8bf2507bc7b23c90bc6dc71ea2460e277d3800a Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期五, 30 一月 2026 19:23:44 +0800
Subject: [PATCH] 导入测试
---
service-job/src/main/java/com/java110/job/importData/adapt/ImportPhoneBillFeeV2QueueDataAdapt.java | 84 +++++++++++++++++++++--------------------
1 files changed, 43 insertions(+), 41 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/importData/adapt/ImportPhoneBillFeeV2QueueDataAdapt.java b/service-job/src/main/java/com/java110/job/importData/adapt/ImportPhoneBillFeeV2QueueDataAdapt.java
index 692991c..ee3522e 100644
--- a/service-job/src/main/java/com/java110/job/importData/adapt/ImportPhoneBillFeeV2QueueDataAdapt.java
+++ b/service-job/src/main/java/com/java110/job/importData/adapt/ImportPhoneBillFeeV2QueueDataAdapt.java
@@ -100,7 +100,6 @@
PayFeePo payFeePo = BeanConvertUtil.covertBean(reqJson, PayFeePo.class);
payFeePo.setCommunityId(po.getCommunityId());
payFeePo.setFeeId(po.getFeeId());
- payFeePo.setIncomeObjId(reqJson.getString("storeId"));
payFeePo.setAmount(po.getPayableAmount());
if (payFeePo.getAmount().isEmpty()){
payFeePo.setAmount("-1");
@@ -116,7 +115,7 @@
payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
payFeePo.setbId("-1");
payFeePo.setFeeFlag(FeeDto.FEE_FLAG_ONCE);
- payFeePo.setState(FeeDto.STATE_DOING);
+ payFeePo.setState(FeeDto.STATE_FINISH);
payFeePo.setIncomeObjId("102025062610470035");
payFeePo.setUserId("-1");
@@ -198,48 +197,51 @@
private void validateRoom(PhoneBillFlow po) {
RoomDto roomDto = new RoomDto();
roomDto.setRoadName(po.getRoadName());
- roomDto.setFloorNum(po.getFloorNum());
+ roomDto.setFloorNum(Vtil.defaultValueToNumber(po.getFloorNum()));
roomDto.setCommunityId(po.getCommunityId());
- roomDto.setUnitNum(po.getUnitNum());
- roomDto.setRoomNum(po.getRoomNum());
+ roomDto.setUnitNum(Vtil.defaultValueToNumber(po.getUnitNum()));
+ roomDto.setRoomNum(Vtil.defaultValueToNumber(po.getRoomNum()));
+ if (roomDto.getRoomNum().isEmpty()) {
+ roomDto.setRoomNumIsNull("yes");
+ }
List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
if (roomDtos.isEmpty()) {
-// throw new IllegalArgumentException("鏈煡璇㈠埌鎴垮眿锛�" + po.getObjName());
- ImportOwnerRoomDto importOwnerRoomDto = new ImportOwnerRoomDto();//鎴垮眿
- importOwnerRoomDto.setUserId(po.getUserId());
- importOwnerRoomDto.setRoomId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_roomId));
- importOwnerRoomDto.setOwnerId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ownerId));
- importOwnerRoomDto.setUserId(po.getUserId());
- importOwnerRoomDto.setLayerCount("0");
- importOwnerRoomDto.setLayer("0");
- importOwnerRoomDto.setLift("鏈煡");
- importOwnerRoomDto.setSection("10102");
- importOwnerRoomDto.setOwnerTypeCd("1001");
- importOwnerRoomDto.setPersonType(OwnerDto.PERSON_TYPE_PERSON);
- importOwnerRoomDto.setPersonRole(OwnerDto.PERSON_ROLE_OWNER);
- importOwnerRoomDto.setRoomSubType(RoomDto.ROOM_SUB_TYPE_HOUSE);
- importOwnerRoomDto.setCommunityId(po.getCommunityId());//灏忓尯缂栧彿
- //---------
-
- importOwnerRoomDto.setRoadName(roomDto.getRoadName());//璺悕
- importOwnerRoomDto.setFloorNum(roomDto.getFloorNum());//寮�
- importOwnerRoomDto.setUnitNum(roomDto.getUnitNum());//闂�
- importOwnerRoomDto.setRoomNum(roomDto.getRoomNum());//瀹�
- importOwnerRoomDto.setDoorRoomNum(roomDto.getUnitNum() + "-" + roomDto.getRoomNum());//闂ㄥ競鍙�
- importOwnerRoomDto.setPropertyAddress(
- roomDto.getRoadName() + roomDto.getFloorNum() + roomDto.getUnitNum() + roomDto.getRoomNum()
- );//涓氫富鍦板潃
- importOwnerRoomDto.setBuiltUpArea("0");//闈㈢Н
- importOwnerRoomDto.setRoomArea("0");//闈㈢Н
- importOwnerRoomDto.setRoomRent("0");//闈㈢Н
- importOwnerRoomDto.setSellState(RoomDto.STATE_FREE);//鎴垮眿鐘舵��
- importOwnerRoomDto.setRoomState(Vtil.defaultValue(importOwnerRoomDto.getOwnerName()).equals("") ? "2004" : "2001");
- int i = importOwnerRoomInnerServiceSMOImpl.saveOwnerRoom(importOwnerRoomDto);
-
- if (i == 0) {
- throw new IllegalArgumentException("鎴垮眿娣诲姞閿欒");
- }
- po.setRoomId(importOwnerRoomDto.getRoomId());
+ throw new IllegalArgumentException("鏈煡璇㈠埌鎴垮眿锛�" + po.getAddress());
+// ImportOwnerRoomDto importOwnerRoomDto = new ImportOwnerRoomDto();//鎴垮眿
+// importOwnerRoomDto.setUserId(po.getUserId());
+// importOwnerRoomDto.setRoomId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_roomId));
+// importOwnerRoomDto.setOwnerId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ownerId));
+// importOwnerRoomDto.setUserId(po.getUserId());
+// importOwnerRoomDto.setLayerCount("0");
+// importOwnerRoomDto.setLayer("0");
+// importOwnerRoomDto.setLift("鏈煡");
+// importOwnerRoomDto.setSection("10102");
+// importOwnerRoomDto.setOwnerTypeCd("1001");
+// importOwnerRoomDto.setPersonType(OwnerDto.PERSON_TYPE_PERSON);
+// importOwnerRoomDto.setPersonRole(OwnerDto.PERSON_ROLE_OWNER);
+// importOwnerRoomDto.setRoomSubType(RoomDto.ROOM_SUB_TYPE_HOUSE);
+// importOwnerRoomDto.setCommunityId(po.getCommunityId());//灏忓尯缂栧彿
+// //---------
+//
+// importOwnerRoomDto.setRoadName(roomDto.getRoadName());//璺悕
+// importOwnerRoomDto.setFloorNum(roomDto.getFloorNum());//寮�
+// importOwnerRoomDto.setUnitNum(roomDto.getUnitNum());//闂�
+// importOwnerRoomDto.setRoomNum(roomDto.getRoomNum());//瀹�
+// importOwnerRoomDto.setDoorRoomNum(roomDto.getUnitNum() + "-" + roomDto.getRoomNum());//闂ㄥ競鍙�
+// importOwnerRoomDto.setPropertyAddress(
+// roomDto.getRoadName() + roomDto.getFloorNum() + roomDto.getUnitNum() + roomDto.getRoomNum()
+// );//涓氫富鍦板潃
+// importOwnerRoomDto.setBuiltUpArea("0");//闈㈢Н
+// importOwnerRoomDto.setRoomArea("0");//闈㈢Н
+// importOwnerRoomDto.setRoomRent("0");//闈㈢Н
+// importOwnerRoomDto.setSellState(RoomDto.STATE_FREE);//鎴垮眿鐘舵��
+// importOwnerRoomDto.setRoomState(Vtil.defaultValue(importOwnerRoomDto.getOwnerName()).equals("") ? "2004" : "2001");
+// int i = importOwnerRoomInnerServiceSMOImpl.saveOwnerRoom(importOwnerRoomDto);
+//
+// if (i == 0) {
+// throw new IllegalArgumentException("鎴垮眿娣诲姞閿欒");
+// }
+// po.setRoomId(importOwnerRoomDto.getRoomId());
} else if (roomDtos.size() > 1) {
throw new IllegalArgumentException("瀛樺湪閲嶅鐨勬埧灞嬶紝璇﹁瀵煎叆璇︽儏");
} else {
--
Gitblit v1.8.0