From 4470abfda4497e366d4b98d0553a910a1a099898 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 12 六月 2020 09:03:46 +0800
Subject: [PATCH] 优化支付报错问题
---
service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java | 181 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 175 insertions(+), 6 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java
index 6e786b6..9edbb35 100644
--- a/service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.component.BaseComponentSMO;
import com.java110.core.context.IPageData;
+import com.java110.entity.assetImport.ImportFee;
import com.java110.entity.assetImport.ImportFloor;
import com.java110.entity.assetImport.ImportOwner;
import com.java110.entity.assetImport.ImportParkingSpace;
@@ -57,6 +58,7 @@
String[] headers = null; //琛ㄥご淇℃伅
List<ImportFloor> floors = new ArrayList<ImportFloor>();
List<ImportOwner> owners = new ArrayList<ImportOwner>();
+ List<ImportFee> fees = new ArrayList<>();
List<ImportRoom> rooms = new ArrayList<ImportRoom>();
List<ImportParkingSpace> parkingSpaces = new ArrayList<ImportParkingSpace>();
workbook = ImportExcelUtils.createWorkbook(uploadFile);
@@ -64,6 +66,9 @@
getFloors(workbook, floors);
//鑾峰彇涓氫富淇℃伅
getOwners(workbook, owners);
+
+
+ getFee(workbook, fees);
//鑾峰彇鎴垮眿淇℃伅
getRooms(workbook, rooms, floors, owners);
@@ -75,7 +80,7 @@
importExcelDataValidate(floors, owners, rooms, parkingSpaces);
// 淇濆瓨鏁版嵁
- return dealExcelData(pd, floors, owners, rooms, parkingSpaces, result);
+ return dealExcelData(pd, floors, owners, rooms, parkingSpaces, fees, result);
}
/**
@@ -86,7 +91,13 @@
* @param rooms 鎴垮眿淇℃伅
* @param parkingSpaces 杞︿綅淇℃伅
*/
- private ResponseEntity<String> dealExcelData(IPageData pd, List<ImportFloor> floors, List<ImportOwner> owners, List<ImportRoom> rooms, List<ImportParkingSpace> parkingSpaces, ComponentValidateResult result) {
+ private ResponseEntity<String> dealExcelData(IPageData pd,
+ List<ImportFloor> floors,
+ List<ImportOwner> owners,
+ List<ImportRoom> rooms,
+ List<ImportParkingSpace> parkingSpaces,
+ List<ImportFee> fees,
+ ComponentValidateResult result) {
ResponseEntity<String> responseEntity = null;
//淇濆瓨鍗曞厓淇℃伅 鍜� 妤兼爧淇℃伅
responseEntity = savedFloorAndUnitInfo(pd, floors, result);
@@ -101,8 +112,14 @@
return responseEntity;
}
+ // 淇濆瓨璐圭敤椤�
+ responseEntity = savedFeeInfo(pd, fees, result);
+ if (responseEntity == null || responseEntity.getStatusCode() != HttpStatus.OK) {
+ return responseEntity;
+ }
+
//淇濆瓨鎴垮眿
- responseEntity = savedRoomInfo(pd, rooms, result);
+ responseEntity = savedRoomInfo(pd, rooms, fees, result);
if (responseEntity == null || responseEntity.getStatusCode() != HttpStatus.OK) {
return responseEntity;
}
@@ -112,6 +129,34 @@
if (responseEntity == null || responseEntity.getStatusCode() != HttpStatus.OK) {
return responseEntity;
+ }
+
+ return responseEntity;
+ }
+
+ private ResponseEntity<String> savedFeeInfo(IPageData pd, List<ImportFee> fees, ComponentValidateResult result) {
+ String apiUrl = "";
+ JSONObject paramIn = null;
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>("鎴愬姛", HttpStatus.OK);
+ ImportOwner owner = null;
+ for (ImportFee fee : fees) {
+ JSONObject savedFeeConfigInfo = getExistsFee(pd, result, fee);
+ if (savedFeeConfigInfo != null) {
+ continue;
+ }
+
+ //paramIn = new JSONObject();
+ //淇濆瓨 璐圭敤椤�
+
+ apiUrl = ServiceConstant.SERVICE_API_URL + "/api/feeConfig.saveFeeConfig";
+
+ paramIn = JSONObject.parseObject(JSONObject.toJSONString(fee));
+ paramIn.put("communityId", result.getCommunityId());
+
+ responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ continue;
+ }
}
return responseEntity;
@@ -225,7 +270,7 @@
* @param result
* @return
*/
- private ResponseEntity<String> savedRoomInfo(IPageData pd, List<ImportRoom> rooms, ComponentValidateResult result) {
+ private ResponseEntity<String> savedRoomInfo(IPageData pd, List<ImportRoom> rooms, List<ImportFee> fees, ComponentValidateResult result) {
String apiUrl = "";
JSONObject paramIn = null;
ResponseEntity<String> responseEntity = new ResponseEntity<String>("鎴愬姛", HttpStatus.OK);
@@ -240,7 +285,6 @@
//淇濆瓨 鎴垮眿
-
apiUrl = ServiceConstant.SERVICE_API_URL + "/api/room.saveRoom";
paramIn.put("communityId", result.getCommunityId());
@@ -252,6 +296,7 @@
paramIn.put("state", "2002");
paramIn.put("builtUpArea", room.getBuiltUpArea());
paramIn.put("unitPrice", "1000.00");
+
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
@@ -273,7 +318,47 @@
paramIn.put("roomId", savedRoomInfo.getString("roomId"));
paramIn.put("state", "2001");
paramIn.put("storeId", result.getStoreId());
+ if (!StringUtil.isEmpty(room.getRoomFeeId()) && "0".equals(room.getRoomFeeId())) {
+ paramIn.put("feeEndDate", room.getFeeEndDate());
+ }
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ continue;
+ }
+ //鍒涘缓璐圭敤
+ if (StringUtil.isEmpty(room.getRoomFeeId()) || "0".equals(room.getRoomFeeId())) {
+ continue;
+ }
+ String[] feeIds = room.getRoomFeeId().split("#");
+
+ for (int feeIndex = 0; feeIndex < feeIds.length; feeIndex++) {
+ String feeId = feeIds[feeIndex];
+ ImportFee tmpFee = null;
+ for (ImportFee fee : fees) {
+ if (feeId.equals(fee.getId())) {
+ tmpFee = fee;
+ }
+ }
+
+ if (tmpFee == null) {
+ continue;//娌℃湁璐圭敤椤癸紝鍙兘鍐欓敊浜�
+ }
+
+ JSONObject ttFee = getExistsFee(pd, result, tmpFee);
+
+ if (ttFee == null) {
+ continue;//娌℃湁璐圭敤椤癸紝鍙兘鍐欓敊浜�
+ }
+
+ apiUrl = ServiceConstant.SERVICE_API_URL + "/api/fee.saveRoomCreateFee";
+ paramIn.put("communityId", result.getCommunityId());
+ paramIn.put("locationTypeCd", "3000");
+ paramIn.put("locationObjId", savedRoomInfo.getString("roomId"));
+ paramIn.put("configId", ttFee.getString("configId"));
+ paramIn.put("storeId", result.getStoreId());
+ paramIn.put("feeEndDate", room.getFeeEndDate().split("#")[feeIndex]);
+ responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
+ }
}
@@ -311,6 +396,39 @@
JSONObject savedParkingSpaceInfo = savedParkingSpaceInfoResults.getJSONArray("parkingSpaces").getJSONObject(0);
return savedParkingSpaceInfo;
+ }
+
+ /**
+ * 鏌ヨ瀛樺湪鐨勬埧灞嬩俊鎭�
+ * room.queryRooms
+ *
+ * @param pd
+ * @param result
+ * @param fee
+ * @return
+ */
+ private JSONObject getExistsFee(IPageData pd, ComponentValidateResult result, ImportFee fee) {
+ String apiUrl = "";
+ ResponseEntity<String> responseEntity = null;
+ apiUrl = ServiceConstant.SERVICE_API_URL + "/api/feeConfig.listFeeConfigs?page=1&row=1&communityId=" + result.getCommunityId()
+ + "&feeName=" + fee.getFeeName();
+ responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
+
+ if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
+ return null;
+ }
+
+ JSONObject savedRoomInfoResults = JSONObject.parseObject(responseEntity.getBody());
+
+
+ if (!savedRoomInfoResults.containsKey("feeConfigs") || savedRoomInfoResults.getJSONArray("feeConfigs").size() != 1) {
+ return null;
+ }
+
+
+ JSONObject savedFeeConfigInfo = savedRoomInfoResults.getJSONArray("feeConfigs").getJSONObject(0);
+
+ return savedFeeConfigInfo;
}
@@ -631,12 +749,63 @@
importRoom.setLayer(Integer.parseInt(os[3].toString()));
importRoom.setSection(os[4].toString());
importRoom.setBuiltUpArea(Double.parseDouble(os[5].toString()));
+
+ if (!StringUtil.isEmpty(os[7].toString())) {
+ importRoom.setRoomFeeId(os[7].toString());
+ importRoom.setFeeEndDate(os[8].toString());
+ }
if (StringUtil.isNullOrNone(os[6])) {
rooms.add(importRoom);
continue;
}
importRoom.setImportOwner(getImportOwner(owners, os[6].toString()));
rooms.add(importRoom);
+ }
+ }
+
+ /**
+ * 鑾峰彇 鎴垮眿淇℃伅
+ *
+ * @param workbook
+ * @param importFees
+ */
+ private void getFee(Workbook workbook, List<ImportFee> importFees) {
+ Sheet sheet = null;
+ sheet = ImportExcelUtils.getSheet(workbook, "璐圭敤璁剧疆");
+ List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
+ ImportFee importFee = null;
+ for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
+ Object[] os = oList.get(osIndex);
+ if (osIndex == 0) { // 绗竴琛屾槸 澶撮儴淇℃伅 鐩存帴璺宠繃
+ continue;
+ }
+ if (StringUtil.isNullOrNone(os[0])) {
+ continue;
+ }
+ importFee = new ImportFee();
+ importFee.setId(os[0].toString());
+ importFee.setFeeTypeCd("鐗╀笟璐�".equals(os[1]) ? "888800010001" : "888800010002");
+ importFee.setFeeName(os[2].toString());
+ importFee.setFeeFlag("鍛ㄦ湡鎬ц垂鐢�".equals(os[3]) ? "1003006" : "2006012");
+ importFee.setPaymentCd("棰勪粯璐�".equals(os[4]) ? "1200" : "2100");
+ String billType = "";
+ if ("姣忓勾1鏈�1鏃�".equals(os[6])) {
+ billType = "001";
+ } else if ("姣忔湀1鏃�".equals(os[6])) {
+ billType = "002";
+ } else if ("姣忔棩".equals(os[6])) {
+ billType = "003";
+ } else {
+ billType = "004";
+ }
+ importFee.setBillType(billType);
+ importFee.setPaymentCycle(os[5].toString());
+ importFee.setStartTime(os[7].toString());
+ importFee.setEndTime(os[8].toString());
+ importFee.setComputingFormula(os[9].toString());
+ importFee.setSquarePrice(os[10].toString());
+ importFee.setAdditionalAmount(os[11].toString());
+ importFees.add(importFee);
}
}
@@ -695,7 +864,7 @@
}
String tel = StringUtil.isNullOrNone(os[4]) ? "19999999999" : os[4].toString();
String idCard = StringUtil.isNullOrNone(os[5]) ? "10000000000000000001" : os[5].toString();
- String age = StringUtil.isNullOrNone(os[2]) ? CommonUtil.getAgeByCertId(idCard) : os[2].toString();
+ String age = StringUtil.isNullOrNone(os[3]) ? CommonUtil.getAgeByCertId(idCard) : os[3].toString();
importOwner = new ImportOwner();
importOwner.setOwnerNum(os[0].toString());
importOwner.setOwnerName(os[1].toString());
--
Gitblit v1.8.0