修复出售车辆 结束时间不变问题

Api/src/main/java/com/java110/api/listener/parkingSpace/QueryParkingSpacesByOwnerListener.java

@@ -74,7 +74,7 @@ public class QueryParkingSpacesByOwnerListener extends AbstractServiceApiDataFlo
         //在没有 停车位的情况下 直接返回空
         ResponseEntity<String> responseEntity = null;
         if (ownerCarDtos == null || ownerCarDtos.size() == 0) {
-            responseEntity = new ResponseEntity<String>("[]", HttpStatus.OK);
+            responseEntity = new ResponseEntity<String>("{\"parkingSpaces\":[]}", HttpStatus.OK);
             dataFlowContext.setResponseEntity(responseEntity);
             return;
         }

Api/src/main/java/com/java110/api/listener/parkingSpace/SellParkingSpaceListener.java

@@ -25,6 +25,8 @@ import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.StringUtils;
 
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -327,8 +329,15 @@ public class SellParkingSpaceListener extends AbstractServiceApiDataFlowListener
         paramInJson.put("cycles", cycles);
 
         //计算结束时间
+        String endTime = "2038-01-01 00:00:00";
+        if(isHireParkingSpace(paramInJson)) {
+            Date et = DateUtil.getCurrentDate();
+            Calendar endCalender = Calendar.getInstance();
+            endCalender.setTime(et);
+            endCalender.add(Calendar.MONTH, Integer.parseInt(paramInJson.getString("cycles")));
+            endTime = DateUtil.getFormatTimeString(endCalender.getTime(), DateUtil.DATE_FORMATE_STRING_A);
+        }
 
-        String endTime = isHireParkingSpace(paramInJson) ? DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A) : "2038-01-01 00:00:00";
         paramInJson.put("endTime", endTime);
 
     }

WebService/src/main/java/com/java110/web/smo/assetImport/impl/AssetImportSMOImpl.java

@@ -179,6 +179,10 @@ public class AssetImportSMOImpl extends BaseComponentSMO implements IAssetImport
             paramIn.put("storeId", result.getStoreId());
             paramIn.put("sellOrHire", parkingSpace.getSellOrHire());
 
+            if("H".equals(parkingSpace.getSellOrHire())){
+                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/fee.queryFeeConfig?communityId=" + result.getCommunityId() + "&feeTypeCd=" + feeTypeCd;