From d0b19298e28a9b8b50c778704b77160f17e73950 Mon Sep 17 00:00:00 2001
From: jialh <1972868360@qq.com>
Date: 星期五, 17 四月 2026 18:20:38 +0800
Subject: [PATCH] 水电话费
---
service-api/src/main/java/com/java110/api/importData/adapt/ImportCarHistoryFeeDetailDataCleaningAdapt.java | 28 ++++++----------------------
1 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/importData/adapt/ImportCarHistoryFeeDetailDataCleaningAdapt.java b/service-api/src/main/java/com/java110/api/importData/adapt/ImportCarHistoryFeeDetailDataCleaningAdapt.java
index 75c4fd6..19959aa 100644
--- a/service-api/src/main/java/com/java110/api/importData/adapt/ImportCarHistoryFeeDetailDataCleaningAdapt.java
+++ b/service-api/src/main/java/com/java110/api/importData/adapt/ImportCarHistoryFeeDetailDataCleaningAdapt.java
@@ -113,7 +113,9 @@
Assert.hasValue(os[3], (osIndex + 1) + "琛屽紑濮嬫椂闂翠笉鑳戒负绌�");
Assert.hasValue(os[4], (osIndex + 1) + "琛岀粨鏉熸椂闂翠笉鑳戒负绌�");
Assert.hasValue(os[5], (osIndex + 1) + "琛岀即璐规椂闂翠笉鑳戒负绌�");
- Assert.hasValue(os[6], (osIndex + 1) + "琛岀即璐归噾棰濅笉鑳戒负绌�");
+ Assert.hasValue(os[6], (osIndex + 1) + "琛屽簲缂撮噾棰濅笉鑳戒负绌�");
+ Assert.hasValue(os[7], (osIndex + 1) + "琛屽疄缂撮噾棰濅笉鑳戒负绌�");
+ Assert.hasValue(os[8], (osIndex + 1) + "琛屾敹閾跺憳涓嶈兘涓虹┖");
//
@@ -132,7 +134,9 @@
importRoomFee.setStartTime(startTime);
importRoomFee.setEndTime(endTime);
importRoomFee.setCreateTime(createTime);
- importRoomFee.setAmount(os[6].toString());
+ importRoomFee.setReceivableAmount(os[6].toString());
+ importRoomFee.setAmount(os[7].toString());
+ importRoomFee.setStaffName(os[8].toString());
importRoomFee.setRemark(!StringUtil.isNullOrNone(os[7]) ? os[7].toString() : "");
rooms.add(importRoomFee);
}
@@ -143,26 +147,6 @@
*
* @param reqJson
*/
- private void generatorBatch(JSONObject reqJson) {
- PayFeeBatchPo payFeeBatchPo = new PayFeeBatchPo();
- payFeeBatchPo.setBatchId(GenerateCodeFactory.getGeneratorId("12"));
- payFeeBatchPo.setCommunityId(reqJson.getString("communityId"));
- payFeeBatchPo.setCreateUserId(reqJson.getString("userId"));
- UserDto userDto = new UserDto();
- userDto.setUserId(reqJson.getString("userId"));
- List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);
- Assert.listOnlyOne(userDtos, "鐢ㄦ埛涓嶅瓨鍦�");
- payFeeBatchPo.setCreateUserName(userDtos.get(0).getUserName());
- payFeeBatchPo.setState(PayFeeBatchDto.STATE_NORMAL);
- payFeeBatchPo.setMsg("姝ｅ父");
- int flag = payFeeBatchV1InnerServiceSMOImpl.savePayFeeBatch(payFeeBatchPo);
-
- if (flag < 1) {
- throw new IllegalArgumentException("鐢熸垚鎵规澶辫触");
- }
-
- reqJson.put("batchId", payFeeBatchPo.getBatchId());
- }
}
--
Gitblit v1.8.0