加入历史缴费导入

service-fee/src/main/java/com/java110/fee/api/PayFeeDetailApi.java

@@ -29,10 +29,10 @@ public class PayFeeDetailApi {
      */
     @RequestMapping(value = "/importPayFeeDetail", method = RequestMethod.POST)
     public ResponseEntity<String> saveImportFeeDetail(@RequestBody String reqJsonStr) {
+        JSONObject reqJson = JSONObject.parseObject(reqJsonStr);
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含小区信息");
 
-        Assert.hasKeyAndValue(reqJsonStr, "communityId", "请求报文中未包含小区信息");
 
-        JSONObject reqJson = JSONObject.parseObject(reqJsonStr);
 
 
         return importPayFeeDetailImpl.importPayFeeDetail(reqJson);

service-fee/src/main/java/com/java110/fee/bmo/payFeeDetail/impl/ImportPayFeeDetailBMOImpl.java

@@ -57,7 +57,7 @@ public class ImportPayFeeDetailBMOImpl implements IImportPayFeeBMODetail {
         String storeId = reqJson.getString("storeId");
         String userId = reqJson.getString("userId");
 
-        JSONArray datas = reqJson.getJSONArray("datas");
+        JSONArray datas = reqJson.getJSONArray("importRoomFees");
 
         JSONObject data = null;
         List<ImportRoomFee> importRoomFees = new ArrayList<>();
@@ -104,6 +104,8 @@ public class ImportPayFeeDetailBMOImpl implements IImportPayFeeBMODetail {
         FeeDto feeDto = new FeeDto();
         feeDto.setConfigId(tmpFeeConfigDto.getConfigId());
         feeDto.setCommunityId(importRoomFee.getCommunityId());
+        feeDto.setPayerObjId(importRoomFee.getRoomId());
+        feeDto.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
         List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
 
         List<PayFeePo> payFeePos = null;