From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante
---
service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java b/service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java
old mode 100644
new mode 100755
index a6a20f6..a5eb935
--- a/service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java
@@ -1,15 +1,15 @@
package com.java110.fee.api;
import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.importFee.ImportFeeDto;
-import com.java110.dto.importFeeDetail.ImportFeeDetailDto;
+import com.java110.dto.importData.ImportFeeDto;
+import com.java110.dto.importData.ImportFeeDetailDto;
import com.java110.fee.bmo.importFee.IFeeSharingBMO;
import com.java110.fee.bmo.importFee.IGetImportFeeBMO;
import com.java110.fee.bmo.importFeeDetail.IDeleteImportFeeDetailBMO;
import com.java110.fee.bmo.importFeeDetail.IGetImportFeeDetailBMO;
import com.java110.fee.bmo.importFeeDetail.ISaveImportFeeDetailBMO;
import com.java110.fee.bmo.importFeeDetail.IUpdateImportFeeDetailBMO;
-import com.java110.po.importFeeDetail.ImportFeeDetailPo;
+import com.java110.po.importFee.ImportFeeDetailPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -108,7 +108,8 @@
@RequestParam(value = "floorNum", required = false) String floorNum,
@RequestParam(value = "unitNum", required = false) String unitNum,
@RequestParam(value = "roomNum", required = false) String roomNum,
- @RequestParam(value = "importFeeId") String importFeeId) {
+ @RequestParam(value = "feeId", required = false) String feeId,
+ @RequestParam(value = "importFeeId", required = false) String importFeeId) {
ImportFeeDetailDto importFeeDetailDto = new ImportFeeDetailDto();
importFeeDetailDto.setPage(page);
importFeeDetailDto.setRow(row);
@@ -117,6 +118,7 @@
importFeeDetailDto.setFloorNum(floorNum);
importFeeDetailDto.setUnitNum(unitNum);
importFeeDetailDto.setRoomNum(roomNum);
+ importFeeDetailDto.setFeeId(feeId);
return getImportFeeDetailBMOImpl.get(importFeeDetailDto);
}
@@ -154,7 +156,9 @@
* @path /app/importFee/feeSharing
*/
@RequestMapping(value = "/feeSharing", method = RequestMethod.POST)
- public ResponseEntity<String> feeSharing(@RequestBody String reqJson) {
+ public ResponseEntity<String> feeSharing(@RequestBody String reqJson,
+ @RequestHeader(value = "store-id") String storeId,
+ @RequestHeader(value = "user-id") String userId) {
JSONObject reqObj = JSONObject.parseObject(reqJson);
Assert.hasKeyAndValue(reqObj, "communityId", "鏈寘鍚皬鍖篒D");
Assert.hasKeyAndValue(reqObj, "totalDegrees", "鏈寘鍚娇鐢ㄩ噺");
@@ -165,6 +169,9 @@
Assert.hasKeyAndValue(reqObj, "endTime", "鏈寘鍚粨鏉熸椂闂�");
Assert.hasKeyAndValue(reqObj, "objId", "鏈寘鍚叕鎽婂璞�");
Assert.hasKeyAndValue(reqObj, "feeTypeCd", "鏈寘鍚垂鐢ㄧ被鍨�");
+ Assert.hasKeyAndValue(reqObj, "roomType", "鏈寘鍚埧灞嬬被鍨�");
+ reqObj.put("storeId", storeId);
+ reqObj.put("userId", userId);
return feeSharingBMOImpl.share(reqObj);
}
--
Gitblit v1.8.0