From b536b4e005a3aee7908a60c31eddff90bf4b98dc Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 07 八月 2021 22:20:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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..482af59
--- a/service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java
@@ -2,7 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.importFee.ImportFeeDto;
-import com.java110.dto.importFeeDetail.ImportFeeDetailDto;
+import com.java110.dto.importFee.ImportFeeDetailDto;
import com.java110.fee.bmo.importFee.IFeeSharingBMO;
import com.java110.fee.bmo.importFee.IGetImportFeeBMO;
import com.java110.fee.bmo.importFeeDetail.IDeleteImportFeeDetailBMO;
@@ -154,7 +154,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 +167,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