From b88a288f4f787b509463678e3cd9ccfa3f37014b Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期三, 11 三月 2026 12:01:05 +0800
Subject: [PATCH] 导入测试
---
service-job/src/main/java/com/java110/job/importData/adapt/ImportPhoneBillFeeV2QueueDataAdapt.java | 67 +++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 16 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 ee3522e..2b26fff 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
@@ -32,6 +32,7 @@
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
@Service("importPhoneBillFeeV2QueueData")
@@ -91,9 +92,15 @@
po.setId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_waterId));
po.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
- sqlSessionTemplate.insert("phoneBillFlowServiceDaoImpl.savePhoneBillFlowInfo", BeanConvertUtil.beanCovertMap(po));
-// addFee(po, data, assetImportLogDetailDto.getLogId(), assetImportLogDetailDto);
- int i = 1;
+ if (po.getRemark3() != null){
+ po.setRemark1(Vtil.defaultValue(po.getRemark1()) + po.getRemark3());
+ }
+ addFee(po, data, assetImportLogDetailDto.getLogId(), assetImportLogDetailDto);
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
}
private void addFee(PhoneBillFlow po, JSONObject reqJson, String batchId, AssetImportLogDetailDto assetImportLogDetailDto) {
@@ -110,19 +117,31 @@
payFeePo.setConfigId(Vtil.defaultValue(po.getConfigId(), "922026012136272690"));
payFeePo.setPayerObjId(po.getRoomId());
payFeePo.setBatchId(batchId);
- payFeePo.setStartTime(po.getYear() + "-" + po.getMonth() + "-" + "01");
- payFeePo.setEndTime(po.getYear() + "-" + po.getMonth() + "-" + DateUtil.getTotalDaysInMonth(Integer.parseInt(po.getYear()), Integer.parseInt(po.getMonth())));
+ payFeePo.setStartTime(po.getYear() + "-" + Vtil.getMonth(po.getMonth()) + "-" + "01");
+ payFeePo.setEndTime(Vtil.processDateEnhanced(DateUtil.getDateFromStringB(payFeePo.getStartTime()), "end",
+ DateUtil.DATE_FORMATE_STRING_B, null ,"").split(" ")[0]);
payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
payFeePo.setbId("-1");
payFeePo.setFeeFlag(FeeDto.FEE_FLAG_ONCE);
- payFeePo.setState(FeeDto.STATE_FINISH);
+ payFeePo.setState(FeeDto.STATE_DOING);
payFeePo.setIncomeObjId("102025062610470035");
- payFeePo.setUserId("-1");
-
- reqJson.put("feeId", payFeePo.getFeeId());
-
-
-
+ payFeePo.setUserId("-1");;
+ String id = po.getId();
+ po.setId(null);
+ Object o = ((HashMap) sqlSessionTemplate.selectList("phoneBillFlowServiceDaoImpl.queryPhoneBillFlowsCount", BeanConvertUtil.beanCovertMap(po)).get(0)).get("count");
+ if (Integer.parseInt(Vtil.defaultValue(o, "1")) != 0) {
+ throw new IllegalArgumentException("閲嶅鐨勮瘽璐�");
+ }
+ po.setId(id);
+// reqJson.put("feeId", payFeePo.getFeeId());
+// String id = payFeePo.getFeeId();
+// payFeePo.setFeeId(null);
+ int i = payFeeV1InnerServiceSMOImpl.queryPayFeesCountByPo(payFeePo);
+// if (i > 0) {
+// throw new IllegalArgumentException("閲嶅鐨勮瘽璐�");
+// }
+// payFeePo.setFeeId(id);
+ sqlSessionTemplate.insert("phoneBillFlowServiceDaoImpl.savePhoneBillFlowInfo", BeanConvertUtil.beanCovertMap(po));
int flag = payFeeV1InnerServiceSMOImpl.savePayFee(payFeePo);
if (flag < 1) {
throw new CmdException("淇濆瓨鏁版嵁澶辫触");
@@ -155,11 +174,16 @@
ownerDto.setRoomId(reqJson.getString("objId"));
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnersByRoom(ownerDto);
+
if (ownerDtos != null && ownerDtos.size() > 0) {
feeAttrPo = new FeeAttrPo();
feeAttrPo.setCommunityId(po.getCommunityId());
feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_ID);
- feeAttrPo.setValue(ownerDtos.get(0).getOwnerId());
+ if (ownerDtos.size() > 1) {
+ feeAttrPo.setValue("瀵煎叆淇℃伅涓笉瀛樺湪涓氫富");
+ }else {
+ feeAttrPo.setValue(ownerDtos.get(0).getOwnerId());
+ }
feeAttrPo.setFeeId(payFeePo.getFeeId());
feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
flag = feeAttrInnerServiceSMOImpl.saveFeeAttr(feeAttrPo);
@@ -170,7 +194,11 @@
feeAttrPo = new FeeAttrPo();
feeAttrPo.setCommunityId(po.getCommunityId());
feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_LINK);
- feeAttrPo.setValue(ownerDtos.get(0).getLink());
+ if (ownerDtos.size() > 1) {
+ feeAttrPo.setValue("瀵煎叆淇℃伅涓笉瀛樺湪涓氫富");
+ }else {
+ feeAttrPo.setValue(ownerDtos.get(0).getLink());
+ }
feeAttrPo.setFeeId(payFeePo.getFeeId());
feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
flag = feeAttrInnerServiceSMOImpl.saveFeeAttr(feeAttrPo);
@@ -181,7 +209,11 @@
feeAttrPo = new FeeAttrPo();
feeAttrPo.setCommunityId(po.getCommunityId());
feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_NAME);
- feeAttrPo.setValue(ownerDtos.get(0).getName());
+ if (ownerDtos.size() > 1) {
+ feeAttrPo.setValue("瀵煎叆淇℃伅涓笉瀛樺湪涓氫富");
+ }else {
+ feeAttrPo.setValue(ownerDtos.get(0).getName());
+ }
feeAttrPo.setFeeId(payFeePo.getFeeId());
feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
flag = feeAttrInnerServiceSMOImpl.saveFeeAttr(feeAttrPo);
@@ -206,7 +238,10 @@
}
List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
if (roomDtos.isEmpty()) {
- throw new IllegalArgumentException("鏈煡璇㈠埌鎴垮眿锛�" + po.getAddress());
+ po.setRoomId("1");
+ po.setRemark3("\n\n鎴垮眿锛�" +
+ roomDto.getCommunityId() + "-" + roomDto.getRoadName() + "-" + roomDto.getFloorNum() + "-" + roomDto.getUnitNum() + "-" +
+ roomDto.getRoomNum() + "涓嶅瓨鍦紝璇ヨ垂鐢ㄥ瓨鍏ュ叕鍙歌处鎴�");
// ImportOwnerRoomDto importOwnerRoomDto = new ImportOwnerRoomDto();//鎴垮眿
// importOwnerRoomDto.setUserId(po.getUserId());
// importOwnerRoomDto.setRoomId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_roomId));
--
Gitblit v1.8.0