From e23023b93f34286f5a807b0b85e9a0619a297ed7 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 21 二月 2023 23:25:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportMeterWaterFeeSMOImpl.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 49 insertions(+), 5 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportMeterWaterFeeSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportMeterWaterFeeSMOImpl.java
index be43810..c2399c5 100644
--- a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportMeterWaterFeeSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportMeterWaterFeeSMOImpl.java
@@ -7,8 +7,13 @@
import com.java110.core.context.IPageData;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.meterWater.ImportExportMeterWaterDto;
+import com.java110.dto.payFeeBatch.PayFeeBatchDto;
+import com.java110.dto.user.UserDto;
import com.java110.entity.component.ComponentValidateResult;
import com.java110.api.smo.assetImport.IImportMeterWaterFeeSMO;
+import com.java110.intf.fee.IPayFeeBatchV1InnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
+import com.java110.po.payFeeBatch.PayFeeBatchPo;
import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
@@ -18,7 +23,7 @@
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
@@ -48,6 +53,13 @@
@Autowired
private RestTemplate restTemplate;
+
+ @Autowired
+ private IPayFeeBatchV1InnerServiceSMO payFeeBatchV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IUserInnerServiceSMO userInnerServiceSMOImpl;
+
@Override
public ResponseEntity<String> importExcelData(IPageData pd, MultipartFile uploadFile) throws Exception {
@@ -117,13 +129,18 @@
throw new IllegalArgumentException("娌℃湁鏁版嵁闇�瑕佸鐞�");
}
+ //鐢熸垚鎵规
JSONObject data = JSONObject.parseObject(pd.getReqData());
+ data.put("userId", pd.getUserId());
+ data.put("communityId", result.getCommunityId());
+ generatorBatch(data);
+
data.put("importFeeId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
data.put("storeId", result.getStoreId());
data.put("userId", result.getUserId());
data.put("configId", reqJson.getString("configId"));
data.put("feeTypeCd", reqJson.getString("feeTypeCd"));
- data.put("communityId", result.getCommunityId());
+ data.put("meterType", reqJson.getString("meterType"));
List<ImportExportMeterWaterDto> tmpImportRoomFees = new ArrayList<>();
for (int roomIndex = 0; roomIndex < rooms.size(); roomIndex++) {
@@ -155,7 +172,7 @@
JSONArray importRoomFees = JSONArray.parseArray(JSONObject.toJSONString(tmpImportRoomFees));
data.put("importMeteWaterFees", importRoomFees);
- String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/meterWater/importMeterWater";
+ String apiUrl = "/meterWater/importMeterWater";
ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, data.toJSONString(), apiUrl, HttpMethod.POST);
@@ -201,8 +218,8 @@
String startTime = excelDoubleToDate(os[4].toString());
String endTime = excelDoubleToDate(os[6].toString());
- Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "琛屽紑濮嬫椂闂存牸寮忛敊璇� 璇峰～鍐橸YYY-MM-DD 鏂囨湰鏍煎紡");
- Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "琛岀粨鏉熸椂闂存牸寮忛敊璇� 璇峰～鍐橸YYY-MM-DD 鏂囨湰鏍煎紡");
+ Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "琛屼笂鏈熷害鏁版椂闂存牸寮忛敊璇� 璇峰～鍐橸YYY-MM-DD 鏂囨湰鏍煎紡");
+ Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "琛屾湰鏈熷害鏁版椂闂存牸寮忛敊璇� 璇峰～鍐橸YYY-MM-DD 鏂囨湰鏍煎紡");
importRoomFee = new ImportExportMeterWaterDto();
@@ -266,6 +283,33 @@
}
}
+ /**
+ * 鐢熸垚鎵规鍙�
+ *
+ * @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());
+ }
+
//瑙ｆ瀽Excel鏃ユ湡鏍煎紡
public static String excelDoubleToDate(String strDate) {
--
Gitblit v1.8.0