From c3b5bbea29386128bb09da0978fb70da0b5dce39 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期六, 13 三月 2021 17:31:10 +0800
Subject: [PATCH] 1、优化发布广告2、优化字母车位3、优化小区联系方式
---
service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java | 26 +++++++-------------------
1 files changed, 7 insertions(+), 19 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 c391813..55eed6f 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.dto.RoomDto;
import com.java110.entity.assetImport.*;
import com.java110.entity.component.ComponentValidateResult;
import com.java110.front.smo.assetImport.IAssetImportSMO;
@@ -238,22 +239,6 @@
paramIn.put("cycles", "0");
}
-// String feeTypeCd = "1001".equals(parkingSpace.getTypeCd())
-// ? FeeTypeConstant.FEE_TYPE_SELL_UP_PARKING_SPACE : FeeTypeConstant.FEE_TYPE_SELL_DOWN_PARKING_SPACE;
-// apiUrl = ServiceConstant.SERVICE_API_URL + "/api/feeConfig.listFeeConfigs?page=1&row=1&communityId=" + result.getCommunityId() + "&feeTypeCd=" + feeTypeCd + "&isDefault=T";
-// responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
-//
-// if (responseEntity.getStatusCode() != HttpStatus.OK) {
-// continue;
-// }
-
-// JSONObject configInfo = JSONObject.parseObject(responseEntity.getBody()).getJSONArray("feeConfigs").getJSONObject(0);
-// if (!configInfo.containsKey("additionalAmount")) {
-// continue;
-// }
-
-// paramIn.put("receivedAmount", configInfo.getString("additionalAmount"));
-
apiUrl = ServiceConstant.SERVICE_API_URL + "/api/parkingSpace.sellParkingSpace";
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
}
@@ -296,6 +281,7 @@
paramIn.put("state", "2002");
paramIn.put("builtUpArea", room.getBuiltUpArea());
paramIn.put("feeCoefficient", "1.00");
+ paramIn.put("roomType", "0".equals(room.getFloor().getUnitNum()) ? RoomDto.ROOM_TYPE_SHOPS : RoomDto.ROOM_TYPE_SHOPS);
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
@@ -357,6 +343,8 @@
paramIn.put("configId", ttFee.getString("configId"));
paramIn.put("storeId", result.getStoreId());
paramIn.put("feeEndDate", room.getFeeEndDate().split("#")[feeIndex]);
+ paramIn.put("startTime", paramIn.getString("feeEndDate"));
+
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
}
@@ -378,7 +366,7 @@
String apiUrl = "";
ResponseEntity<String> responseEntity = null;
apiUrl = ServiceConstant.SERVICE_API_URL + "/api/parkingSpace.queryParkingSpaces?page=1&row=1&communityId=" + result.getCommunityId()
- + "&num=" + parkingSpace.getPsNum();
+ + "&num=" + parkingSpace.getPsNum() + "&areaNum=" + parkingSpace.getPaNum();
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
@@ -718,7 +706,7 @@
importParkingSpace.setPsNum(os[1].toString());
importParkingSpace.setTypeCd(os[2].toString());
importParkingSpace.setArea(Double.parseDouble(os[3].toString()));
- if (StringUtil.isNullOrNone(os[4])) {
+ if (os.length < 5 || StringUtil.isNullOrNone(os[4])) {
parkingSpaces.add(importParkingSpace);
continue;
}
@@ -925,7 +913,7 @@
owners.add(importOwner);
} catch (Exception e) {
logger.error("绗�" + (osIndex + 1) + "琛屾暟鎹嚭鐜伴棶棰�", e);
- throw new IllegalArgumentException("绗�" + (osIndex + 1) + "琛屾暟鎹嚭鐜伴棶棰�"+e.getLocalizedMessage(),e);
+ throw new IllegalArgumentException("绗�" + (osIndex + 1) + "琛屾暟鎹嚭鐜伴棶棰�" + e.getLocalizedMessage(), e);
}
}
}
--
Gitblit v1.8.0