From 65b30b7cac0a3fdcb8cec19c73411af0e2858766 Mon Sep 17 00:00:00 2001
From: 离歌笑 <137273278@qq.com>
Date: 星期二, 22 十月 2019 16:46:20 +0800
Subject: [PATCH] Merge branch 'tlhhup'
---
WebService/src/main/java/com/java110/web/components/parkingSpace/HireParkingSpaceComponent.java | 26 ++------------------------
1 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/components/parkingSpace/HireParkingSpaceComponent.java b/WebService/src/main/java/com/java110/web/components/parkingSpace/HireParkingSpaceComponent.java
index 8a716d4..d48390a 100644
--- a/WebService/src/main/java/com/java110/web/components/parkingSpace/HireParkingSpaceComponent.java
+++ b/WebService/src/main/java/com/java110/web/components/parkingSpace/HireParkingSpaceComponent.java
@@ -1,10 +1,7 @@
package com.java110.web.components.parkingSpace;
-import com.alibaba.fastjson.JSONObject;
-import com.java110.common.constant.FeeTypeConstant;
import com.java110.core.context.IPageData;
import com.java110.web.smo.ICarServiceSMO;
-import com.java110.web.smo.IFeeServiceSMO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
@@ -19,9 +16,6 @@
private ICarServiceSMO carServiceSMOImpl;
- @Autowired
- private IFeeServiceSMO feeServiceSMOImpl;
-
/**
* 鏌ヨ灏忓尯妤间俊鎭�
*
@@ -33,17 +27,8 @@
return carServiceSMOImpl.saveCar(pd);
}
- /**
- * 鏌ヨ鍑哄敭璐圭敤閰嶇疆
- *
- * @param pd 椤甸潰灏佽瀵硅薄 鍖呭惈椤甸潰璇锋眰鏁版嵁
- * @return ResponseEntity瀵硅薄杩斿洖缁欓〉闈�
- */
- public ResponseEntity<String> loadSellParkingSpaceConfigData(IPageData pd) {
- String paramIn = pd.getReqData();
- JSONObject paramObj = JSONObject.parseObject(paramIn);
- return feeServiceSMOImpl.loadPropertyConfigFee(pd, "1001".equals(paramObj.getString("typeCd"))
- ? FeeTypeConstant.FEE_TYPE_SELL_UP_PARKING_SPACE : FeeTypeConstant.FEE_TYPE_SELL_DOWN_PARKING_SPACE);
+ public ResponseEntity<String> listCarType(IPageData pd){
+ return this.carServiceSMOImpl.listCarType(pd);
}
@@ -55,11 +40,4 @@
this.carServiceSMOImpl = carServiceSMOImpl;
}
- public IFeeServiceSMO getFeeServiceSMOImpl() {
- return feeServiceSMOImpl;
- }
-
- public void setFeeServiceSMOImpl(IFeeServiceSMO feeServiceSMOImpl) {
- this.feeServiceSMOImpl = feeServiceSMOImpl;
- }
}
--
Gitblit v1.8.0