From 093b73aadb022895a02dbbcd64b87613e19b547b Mon Sep 17 00:00:00 2001
From: 1098226878@qq.com <1098226878@qq.com>
Date: 星期一, 10 一月 2022 18:05:21 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportFeeDetailSMOImpl.java | 42 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 insertions(+), 1 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportFeeDetailSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportFeeDetailSMOImpl.java
index a706e34..c21946d 100644
--- a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportFeeDetailSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportFeeDetailSMOImpl.java
@@ -10,9 +10,14 @@
import com.java110.dto.assetImportLog.AssetImportLogDto;
import com.java110.dto.assetImportLogDetail.AssetImportLogDetailDto;
import com.java110.dto.fee.FeeDto;
+import com.java110.dto.payFeeBatch.PayFeeBatchDto;
+import com.java110.dto.user.UserDto;
import com.java110.entity.assetImport.ImportRoomFee;
import com.java110.entity.component.ComponentValidateResult;
import com.java110.api.smo.assetImport.IImportFeeDetailSMO;
+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;
@@ -55,6 +60,13 @@
@Autowired
private ISaveTransactionLogSMO saveTransactionLogSMOImpl;
+
+
+ @Autowired
+ private IPayFeeBatchV1InnerServiceSMO payFeeBatchV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IUserInnerServiceSMO userInnerServiceSMOImpl;
@Override
public ResponseEntity<String> importExcelData(IPageData pd, MultipartFile uploadFile) throws Exception {
@@ -160,11 +172,14 @@
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("communityId", result.getCommunityId());
AssetImportLogDto assetImportLogDto = new AssetImportLogDto();
assetImportLogDto.setSuccessCount(0L);
assetImportLogDto.setErrorCount(0L);
@@ -306,7 +321,32 @@
rooms.add(importRoomFee);
}
}
+ /**
+ * 鐢熸垚鎵规鍙�
+ *
+ * @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