优化代码

java110-bean/src/main/java/com/java110/entity/assetImport/ImportRoomFee.java

@@ -29,6 +29,8 @@ public class ImportRoomFee {
 
     private String communityId;
 
+    private String contractId;
+
     private String cycle;
     private String remark;
     private String ownerId;
@@ -171,4 +173,12 @@ public class ImportRoomFee {
     public void setOwnerLink(String ownerLink) {
         this.ownerLink = ownerLink;
     }
+
+    public String getContractId() {
+        return contractId;
+    }
+
+    public void setContractId(String contractId) {
+        this.contractId = contractId;
+    }
 }

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

@@ -308,4 +308,23 @@ public class FeeApi extends BaseController {
         return importRoomFeeImpl.importCarFee(reqJson);
     }
 
+    /**
+     * 合同费用导入
+     * /feeApi/importContractFees
+     * path /app/feeApi/importContractFees
+     * @param reqString
+     * @return
+     */
+    @RequestMapping(value = "/importContractFees", method = RequestMethod.POST)
+    public ResponseEntity<String> importContractFees(@RequestBody String reqString) {
+
+        JSONObject reqJson = JSONObject.parseObject(reqString);
+        Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区信息");
+        Assert.hasKeyAndValue(reqJson, "feeTypeCd", "未包含费用类型");
+        Assert.hasKeyAndValue(reqJson, "storeId", "未包含商户信息");
+        Assert.hasKeyAndValue(reqJson, "userId", "未包含用户信息");
+
+        return importRoomFeeImpl.importContractFees(reqJson);
+    }
+
 }

service-fee/src/main/java/com/java110/fee/bmo/IImportRoomFee.java

@@ -21,4 +21,11 @@ public interface IImportRoomFee {
      * @return
      */
     ResponseEntity<String> importCarFee(JSONObject reqJson);
+
+    /**
+     * 合同费用导入
+     * @param reqJson
+     * @return
+     */
+    ResponseEntity<String> importContractFees(JSONObject reqJson);
 }

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

@@ -13,12 +13,7 @@ import com.java110.entity.assetImport.ImportRoomFee;
 import com.java110.fee.bmo.IImportRoomFee;
 import com.java110.fee.listener.fee.UpdateFeeInfoListener;
 import com.java110.intf.community.IRoomInnerServiceSMO;
-import com.java110.intf.fee.IFeeAttrInnerServiceSMO;
-import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
-import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
-import com.java110.intf.fee.IFeeInnerServiceSMO;
-import com.java110.intf.fee.IImportFeeDetailInnerServiceSMO;
-import com.java110.intf.fee.IImportFeeInnerServiceSMO;
+import com.java110.intf.fee.*;
 import com.java110.intf.user.IOwnerCarInnerServiceSMO;
 import com.java110.intf.user.IOwnerInnerServiceSMO;
 import com.java110.po.fee.FeeAttrPo;
@@ -454,6 +449,179 @@ public class ImportRoomFeeImpl implements IImportRoomFee {
         return ResultVo.createResponseEntity(data);
     }
 
+    /**
+     * 合同费用导入
+     *
+     * @param reqJson
+     * @return
+     */
+    @Override
+    @Java110Transactional
+    public ResponseEntity<String> importContractFees(JSONObject reqJson) {
+
+        int successCount = 0;
+        int errorCount = 0;
+
+        //小区ID
+        String communityId = reqJson.getString("communityId");
+        String importFeeId = reqJson.getString("importFeeId");
+        String feeTypeCd = reqJson.getString("feeTypeCd");//费用大类
+        String storeId = reqJson.getString("storeId");
+        String userId = reqJson.getString("userId");
+        String feeName = reqJson.getString("feeName");
+
+        if (StringUtil.isEmpty(feeName)) {
+            feeName = IMPORT_FEE_NAME;
+        }
+        FeeConfigDto feeConfigDto = new FeeConfigDto();
+        feeConfigDto.setFeeTypeCd(feeTypeCd);
+        feeConfigDto.setFeeName(feeName);
+        feeConfigDto.setCommunityId(communityId);
+        List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
+        // 根据费用大类 判断是否有存在 费用导入收入项
+        if (feeConfigDtos == null || feeConfigDtos.size() < 1) {
+            //生成导入费
+            feeConfigDto.setConfigId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
+            saveFeeConfig(feeConfigDto);
+        } else {
+            feeConfigDto.setConfigId(feeConfigDtos.get(0).getConfigId());
+        }
+
+
+        JSONArray importCarFees = reqJson.getJSONArray("importRoomFees");
+
+        List<ImportRoomFee> tmpImportContractFees = importCarFees.toJavaList(ImportRoomFee.class);
+
+        for (ImportRoomFee tmpImportCarFee : tmpImportContractFees) {
+            tmpImportCarFee.setCommunityId(communityId);
+        }
+
+        Assert.isNotNull(tmpImportContractFees, "参数错误，未包含处理费用");
+
+        List<PayFeePo> payFeePos = new ArrayList<>();
+        List<FeeAttrPo> feeAttrPos = new ArrayList<>();
+        List<ImportFeeDetailPo> importFeeDetailPos = new ArrayList<>();
+        PayFeePo payFeePo = null;
+        ImportFeeDetailPo importFeeDetailPo = null;
+        for (ImportRoomFee importCarFee : tmpImportContractFees) {
+            if (StringUtil.isEmpty(importCarFee.getContractId()) || importCarFee.getContractId().startsWith("-")
+            ) {
+                errorCount++;
+                continue;
+            }
+            successCount++;
+            payFeePo = new PayFeePo();
+            payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
+            payFeePo.setEndTime(importCarFee.getStartTime());
+            payFeePo.setState(FeeDto.STATE_DOING);
+            payFeePo.setCommunityId(communityId);
+            payFeePo.setConfigId(feeConfigDto.getConfigId());
+            payFeePo.setPayerObjId(importCarFee.getContractId());
+            payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_CONTRACT);
+            payFeePo.setUserId(userId);
+            payFeePo.setIncomeObjId(storeId);
+            payFeePo.setFeeTypeCd(feeTypeCd);
+            payFeePo.setFeeFlag(FeeDto.FEE_FLAG_ONCE);
+            payFeePo.setAmount(importCarFee.getAmount());
+            payFeePo.setStartTime(importCarFee.getStartTime());
+            //payFeePo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+
+            payFeePos.add(payFeePo);
+
+            FeeAttrPo feeAttrPo = new FeeAttrPo();
+            feeAttrPo.setCommunityId(communityId);
+            feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+            feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_IMPORT_FEE_NAME);
+            feeAttrPo.setValue(importCarFee.getFeeName());
+            feeAttrPo.setFeeId(payFeePo.getFeeId());
+            feeAttrPos.add(feeAttrPo);
+
+
+            feeAttrPo = new FeeAttrPo();
+            feeAttrPo.setCommunityId(communityId);
+            feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+            feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME);
+            feeAttrPo.setValue(importCarFee.getEndTime());
+            feeAttrPo.setFeeId(payFeePo.getFeeId());
+            feeAttrPos.add(feeAttrPo);
+
+
+            if (!StringUtil.isEmpty(importCarFee.getOwnerId())) {
+                feeAttrPo = new FeeAttrPo();
+                feeAttrPo.setCommunityId(communityId);
+                feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+                feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_ID);
+                feeAttrPo.setValue(importCarFee.getOwnerId());
+                feeAttrPo.setFeeId(payFeePo.getFeeId());
+                feeAttrPos.add(feeAttrPo);
+
+                feeAttrPo = new FeeAttrPo();
+                feeAttrPo.setCommunityId(communityId);
+                feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+                feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_NAME);
+                feeAttrPo.setValue(importCarFee.getOwnerName());
+                feeAttrPo.setFeeId(payFeePo.getFeeId());
+                feeAttrPos.add(feeAttrPo);
+
+                feeAttrPo = new FeeAttrPo();
+                feeAttrPo.setCommunityId(communityId);
+                feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+                feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_LINK);
+                feeAttrPo.setValue(importCarFee.getOwnerLink());
+                feeAttrPo.setFeeId(payFeePo.getFeeId());
+                feeAttrPos.add(feeAttrPo);
+            }
+
+            importFeeDetailPo = new ImportFeeDetailPo();
+            importFeeDetailPo.setAmount(importCarFee.getAmount());
+            importFeeDetailPo.setCommunityId(communityId);
+            importFeeDetailPo.setEndTime(importCarFee.getEndTime());
+            importFeeDetailPo.setFeeId(payFeePo.getFeeId());
+            importFeeDetailPo.setFeeName(importCarFee.getFeeName());
+            importFeeDetailPo.setFloorNum("-");
+            importFeeDetailPo.setUnitNum("-");
+            importFeeDetailPo.setRoomNum("-");
+            importFeeDetailPo.setRoomId("-");
+            importFeeDetailPo.setObjId(importCarFee.getContractId());
+            importFeeDetailPo.setObjType(FeeDto.PAYER_OBJ_TYPE_CONTRACT);
+            importFeeDetailPo.setObjName("合同");
+            importFeeDetailPo.setStartTime(importCarFee.getStartTime());
+            importFeeDetailPo.setIfdId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_IfdId));
+            importFeeDetailPo.setState("1000");
+            importFeeDetailPo.setImportFeeId(importFeeId);
+            importFeeDetailPos.add(importFeeDetailPo);
+        }
+
+        feeInnerServiceSMOImpl.saveFee(payFeePos);
+
+        feeAttrInnerServiceSMOImpl.saveFeeAttrs(feeAttrPos);
+
+        ImportFeeDto importFeeDto = new ImportFeeDto();
+        importFeeDto.setCommunityId(communityId);
+        importFeeDto.setImportFeeId(importFeeId);
+
+        List<ImportFeeDto> importRoomFeess = importFeeInnerServiceSMOImpl.queryImportFees(importFeeDto);
+
+        if (importRoomFeess == null || importRoomFeess.size() < 1) {
+            //保存日志
+            ImportFeePo importFeePo = new ImportFeePo();
+            importFeePo.setCommunityId(communityId);
+            importFeePo.setFeeTypeCd(feeTypeCd);
+            importFeePo.setImportFeeId(importFeeId);
+            importFeeInnerServiceSMOImpl.saveImportFee(importFeePo);
+        }
+
+
+        importFeeDetailInnerServiceSMOImpl.saveImportFeeDetails(importFeeDetailPos);
+
+
+        JSONObject data = new JSONObject();
+        data.put("successCount", successCount);
+        data.put("errorCount", errorCount);
+
+        return ResultVo.createResponseEntity(data);
+    }
+
     /**
      * 保存保存导入费用配置
      *

service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportRoomFeeSMOImpl.java

@@ -11,6 +11,7 @@ import com.java110.core.component.BaseComponentSMO;
 import com.java110.core.context.IPageData;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.RoomDto;
+import com.java110.dto.fee.FeeDetailDto;
 import com.java110.dto.fee.FeeDto;
 import com.java110.entity.assetImport.ImportRoomFee;
 import com.java110.entity.component.ComponentValidateResult;
@@ -39,6 +40,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
+import org.thymeleaf.util.StringUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -136,6 +138,10 @@ public class ImportRoomFeeSMOImpl extends BaseComponentSMO implements IImportRoo
         JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
         ImportRoomFee importRoomFee = BeanConvertUtil.covertBean(paramIn,ImportRoomFee.class);
         importRoomFee.setRoomId(paramIn.getString("objId"));
+        if(paramIn.containsKey("objType") && FeeDto.PAYER_OBJ_TYPE_CONTRACT.equals(paramIn.getString("objType"))){
+            importRoomFee.setContractId(paramIn.getString("objId"));
+            importRoomFee.setRoomId("");
+        }
         List<ImportRoomFee> rooms = new ArrayList<ImportRoomFee>();
         rooms.add(importRoomFee);
         return dealExcelData(pd, rooms, result);
@@ -258,6 +264,10 @@ public class ImportRoomFeeSMOImpl extends BaseComponentSMO implements IImportRoo
 
         String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/feeApi/importRoomFees";
 
+        if(!StringUtils.isEmpty(tmpImportRoomFee.get(0).getContractId())){
+            apiUrl = ServiceConstant.SERVICE_API_URL + "/api/feeApi/importContractFees";
+        }
+
         ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, data.toJSONString(), apiUrl, HttpMethod.POST);
 
         if (HttpStatus.OK != responseEntity.getStatusCode()) {