java110-bean/src/main/java/com/java110/dto/PropertyWhiteListFlowDto.java
@@ -38,6 +38,19 @@ private Integer row; private Integer page; private String batchId; private String userId; private String storeId; private String objType; public String getObjType() { return objType; } public void setObjType(String objType) { this.objType = objType; } public Integer getPage() { return page; } @@ -265,4 +278,28 @@ public void setCommunityId(String communityId) { this.communityId = communityId; } public String getBatchId() { return batchId; } public void setBatchId(String batchId) { this.batchId = batchId; } public String getUserId() { return userId; } public void setUserId(String userId) { this.userId = userId; } public String getStoreId() { return storeId; } public void setStoreId(String storeId) { this.storeId = storeId; } } java110-bean/src/main/java/com/java110/dto/importData/ImportRoomFee.java
@@ -64,6 +64,18 @@ private String expenseSubject; private String doorRoomNum; private String openInv; public String getOpenInv() { return openInv; } public void setOpenInv(String openInv) { this.openInv = openInv; } public String getReceivableAmount() { return receivableAmount; } @@ -324,4 +336,12 @@ public void setExpenseSubject(String expenseSubject) { this.expenseSubject = expenseSubject; } public String getDoorRoomNum() { return doorRoomNum; } public void setDoorRoomNum(String doorRoomNum) { this.doorRoomNum = doorRoomNum; } } service-api/pom.xml
@@ -56,13 +56,6 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-websocket</artifactId> </dependency> <dependency> <groupId>com.java110</groupId> <artifactId>service-fee</artifactId> <version>1.0-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> service-api/src/main/java/com/java110/api/controller/component/CallComponentController.java
@@ -35,6 +35,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.client.RestTemplate; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.support.StandardMultipartHttpServletRequest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -217,7 +218,7 @@ public ResponseEntity<String> callComponentUploadFile( @PathVariable String componentCode, @PathVariable String componentMethod, @RequestParam("uploadFile") MultipartFile uploadFile, @RequestParam(value = "uploadFile", required = false) MultipartFile uploadFile, @RequestParam(value = "userId", required = false) String userId, HttpServletRequest request) { ResponseEntity<String> responseEntity = null; @@ -337,7 +338,7 @@ * @param request HttpServletRequest 对象 * @return pd 对象 */ private IPageData freshPageDate(HttpServletRequest request) { public IPageData freshPageDate(HttpServletRequest request) { Map<String, String[]> params = request.getParameterMap(); IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA); String reqData = ""; service-api/src/main/java/com/java110/api/importData/DefaultImportDataAdapt.java
@@ -119,7 +119,7 @@ * * @param reqJson */ protected void generatorBatch(JSONObject reqJson) { public void generatorBatch(JSONObject reqJson) { PayFeeBatchPo payFeeBatchPo = new PayFeeBatchPo(); payFeeBatchPo.setBatchId(GenerateCodeFactory.getGeneratorId("12")); payFeeBatchPo.setCommunityId(reqJson.getString("communityId")); service-api/src/main/java/com/java110/api/importData/adapt/ImportHistoryFeeDetailDataCleaningAdapt.java
New file @@ -0,0 +1,147 @@ package com.java110.api.importData.adapt; import com.alibaba.fastjson.JSONObject; import com.java110.api.importData.DefaultImportDataAdapt; import com.java110.api.importData.IImportDataCleaningAdapt; import com.java110.dto.importData.ImportRoomFee; import com.java110.dto.system.ComponentValidateResult; import com.java110.intf.fee.IPayFeeBatchV1InnerServiceSMO; import com.java110.intf.user.IUserInnerServiceSMO; import com.java110.utils.util.Assert; import com.java110.utils.util.DateUtil; import com.java110.utils.util.ImportExcelUtils; import com.java110.utils.util.StringUtil; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; /** * 历史缴费数据导入 * <p> * 导入请求参数中必须包含 * param.append('importAdapt', "importRoomHistoryFeeDetail"); * <p> * vc.http.upload( * 'assetImport', * 'importData', * param, { * emulateJSON: true, * //添加请求头 * headers: { * "Content-Type": "multipart/form-data" * } * }, * function(json, res) { * //vm.menus = vm.refreshMenuActive(JSON.parse(json),0); * let _json = JSON.parse(json); * if (_json.code == 0) { * //关闭model * // vc.toast(_json.data); * $('#importOwnerRoomModel').modal('hide'); * $that.clearAddFeeConfigInfo(); * <p> * vc.jumpToPage('/#/pages/property/assetImportLogDetail?logId=' + _json.data.logId + '&logType=importRoomHistoryFeeDetail'); * return; * } * vc.toast(_json.msg, 10000); * }, * function(errInfo, error) { * console.log('请求失败处理'); * vc.toast(errInfo, 10000); * }); */ @Service("importHistoryFeeDetailDataCleaning") public class ImportHistoryFeeDetailDataCleaningAdapt extends DefaultImportDataAdapt implements IImportDataCleaningAdapt { @Autowired private IPayFeeBatchV1InnerServiceSMO payFeeBatchV1InnerServiceSMOImpl; @Autowired private IUserInnerServiceSMO userInnerServiceSMOImpl; @Override public List analysisExcel(Workbook workbook, JSONObject paramIn, ComponentValidateResult result) throws Exception { generatorBatch(paramIn); List<ImportRoomFee> rooms = new ArrayList<ImportRoomFee>(); //获取楼信息 getRooms(workbook, rooms); for (ImportRoomFee importRoomFee : rooms) { importRoomFee.setBatchId(paramIn.getString("batchId")); importRoomFee.setUserId(paramIn.getString("userId")); importRoomFee.setStoreId(paramIn.getString("storeId")); importRoomFee.setObjType(paramIn.getString("objType")); importRoomFee.setCommunityId(paramIn.getString("communityId")); } return rooms; } /** * 获取 房屋信息 * * @param workbook * @param rooms */ private void getRooms(Workbook workbook, List<ImportRoomFee> rooms) { Sheet sheet = null; sheet = ImportExcelUtils.getSheet(workbook, "房屋缴费历史"); List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet); ImportRoomFee importRoomFee = null; for (int osIndex = 0; osIndex < oList.size(); osIndex++) { Object[] os = oList.get(osIndex); if (osIndex == 0) { // 第一行是 头部信息 直接跳过 continue; } if (StringUtil.isNullOrNone(os[0])) { continue; } //费用名称没有填写,默认跳过 if (StringUtil.isNullOrNone(os[4])) { continue; } Assert.hasValue(os[0], (osIndex + 1) + "行房屋编号不能为空"); Assert.hasValue(os[1], (osIndex + 1) + "行收费项目不能为空"); Assert.hasValue(os[2], (osIndex + 1) + "行缴费周期不能为空"); Assert.hasValue(os[3], (osIndex + 1) + "行开始时间不能为空"); Assert.hasValue(os[4], (osIndex + 1) + "行结束时间不能为空"); Assert.hasValue(os[5], (osIndex + 1) + "行缴费时间不能为空"); Assert.hasValue(os[6], (osIndex + 1) + "行应缴金额不能为空"); Assert.hasValue(os[7], (osIndex + 1) + "行实缴金额不能为空"); Assert.hasValue(os[8], (osIndex + 1) + "行收银员不能为空"); // String startTime = excelDoubleToDate(os[3].toString()); String endTime = excelDoubleToDate(os[4].toString()); String createTime = excelDoubleToDate(os[5].toString()); Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行开始时间格式错误 请填写YYYY-MM-DD 文本格式"); Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行结束时间格式错误 请填写YYYY-MM-DD 文本格式"); Assert.isDate(createTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行结束时间格式错误 请填写YYYY-MM-DD 文本格式"); String[] roomNames = os[0].toString().split("-",3); importRoomFee = new ImportRoomFee(); importRoomFee.setFloorNum(roomNames[0]); importRoomFee.setUnitNum(roomNames[1]); importRoomFee.setRoomNum(roomNames[2]); importRoomFee.setFeeName(os[1].toString()); importRoomFee.setCycle(os[2].toString()); importRoomFee.setStartTime(startTime); importRoomFee.setEndTime(endTime); importRoomFee.setCreateTime(createTime); importRoomFee.setReceivableAmount(os[6].toString()); importRoomFee.setAmount(os[7].toString()); importRoomFee.setStaffName(os[8].toString()); importRoomFee.setRemark(!StringUtil.isNullOrNone(os[9]) ? os[9].toString() : ""); rooms.add(importRoomFee); } } } service-api/src/main/java/com/java110/api/smo/assetImport/impl/AssetImportSMOImpl.java
@@ -4,21 +4,27 @@ import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.java110.api.importData.DefaultImportDataAdapt; import com.java110.api.importData.IImportDataCleaningAdapt; import com.java110.api.smo.DefaultAbstractComponentSMO; import com.java110.api.smo.assetImport.IAssetImportSMO; import com.java110.core.context.IPageData; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.PropertyWhiteListFlowDto; import com.java110.dto.log.AssetImportLogDetailDto; import com.java110.dto.payFee.PayFeeBatchDto; import com.java110.dto.system.ComponentValidateResult; import com.java110.dto.user.UserDto; import com.java110.intf.IImportPropertyWhiteListfFlowServiceSMO; import com.java110.intf.common.IAssetImportLogDetailInnerServiceSMO; import com.java110.intf.common.IAssetImportLogInnerServiceSMO; import com.java110.intf.fee.IPayFeeBatchV1InnerServiceSMO; import com.java110.intf.job.IUserImportDataV1InnerServiceSMO; import com.java110.intf.user.IMenuUserV1InnerServiceSMO; import com.java110.intf.user.IUserInnerServiceSMO; import com.java110.po.log.AssetImportLogDetailPo; import com.java110.po.log.AssetImportLogPo; import com.java110.po.payFee.PayFeeBatchPo; import com.java110.utils.factory.ApplicationContextFactory; import com.java110.utils.util.*; import com.java110.vo.ResultVo; @@ -79,6 +85,13 @@ @Autowired private IUserInnerServiceSMO iUserInnerServiceSMOImpl; @Autowired private IImportPropertyWhiteListfFlowServiceSMO importPropertyWhiteListfFlowServiceSMO; @Autowired private IPayFeeBatchV1InnerServiceSMO payFeeBatchV1InnerServiceSMOImpl; @Override public ResponseEntity<String> importExcelData(IPageData pd, MultipartFile uploadFile) throws Exception { JSONObject paramIn = JSONObject.parseObject(pd.getReqData()); @@ -98,18 +111,61 @@ Workbook workbook = null; //工作簿 //工作表 String[] headers = null; //表头信息 workbook = ImportExcelUtils.createWorkbook(uploadFile); if(uploadFile == null || uploadFile.getSize() == 0){ // todo 适配器封装数据 List datas = importDataCleaningAdapt.analysisExcel(workbook, paramIn, result); PropertyWhiteListFlowDto propertyWhiteListFlowDto = new PropertyWhiteListFlowDto(); propertyWhiteListFlowDto.setCommunityId((String) JSONObject.parseObject(pd.getReqData()).get("communityId")); // todo 适配器封装数据 List<PropertyWhiteListFlowDto> datas = importPropertyWhiteListfFlowServiceSMO.queryPropertyWhiteListFlow(propertyWhiteListFlowDto); PayFeeBatchPo payFeeBatchPo = new PayFeeBatchPo(); payFeeBatchPo.setBatchId(GenerateCodeFactory.getGeneratorId("12")); payFeeBatchPo.setCommunityId(paramIn.getString("communityId")); payFeeBatchPo.setCreateUserId(paramIn.getString("userId")); UserDto userDto = new UserDto(); userDto.setUserId(paramIn.getString("userId")); List<UserDto> userDtos = iUserInnerServiceSMOImpl.getUsers(userDto); Assert.listOnlyOne(userDtos, "用户不存在"); payFeeBatchPo.setCreateUserName(userDtos.get(0).getUserName()); payFeeBatchPo.setState(PayFeeBatchDto.STATE_NORMAL); payFeeBatchPo.setMsg("正常"); int flag = payFeeBatchV1InnerServiceSMOImpl.savePayFeeBatch(payFeeBatchPo); if (datas == null || datas.size() > MAX_LINE) { throw new IllegalArgumentException("数据为空,或者数据行数大于" + MAX_LINE); if (flag < 1) { throw new IllegalArgumentException("生成批次失败"); } paramIn.put("batchId", payFeeBatchPo.getBatchId()); for (PropertyWhiteListFlowDto importRoomFee : datas) { importRoomFee.setUserId(paramIn.getString("userId")); importRoomFee.setStoreId(paramIn.getString("storeId")); importRoomFee.setCommunityId(paramIn.getString("communityId")); importRoomFee.setBatchId(paramIn.getString("batchId")); importRoomFee.setObjType(paramIn.getString("objType")); } if (datas == null || datas.size() > MAX_LINE) { throw new IllegalArgumentException("数据为空,或者数据行数大于" + MAX_LINE); } // 保存数据 return saveLogAndImportData(pd, datas, result, paramIn.getString("importAdapt")); } else{ workbook = ImportExcelUtils.createWorkbook(uploadFile); // 保存数据 return saveLogAndImportData(pd, datas, result, paramIn.getString("importAdapt")); // todo 适配器封装数据 List datas = importDataCleaningAdapt.analysisExcel(workbook, paramIn, result); if (datas == null || datas.size() > MAX_LINE) { throw new IllegalArgumentException("数据为空,或者数据行数大于" + MAX_LINE); } // 保存数据 return saveLogAndImportData(pd, datas, result, paramIn.getString("importAdapt")); } } catch (Exception e) { logger.error("导入失败 ", e); return new ResponseEntity<String>("非常抱歉,您填写的模板数据有误:" + e.getMessage(), HttpStatus.BAD_REQUEST); service-community/src/main/java/com/java110/community/smo/impl/IImportPropertyWhiteListfFlowServiceSMOImpl.java
@@ -36,8 +36,10 @@ @Override public List<PropertyWhiteListFlowDto> queryPropertyWhiteListFlow(PropertyWhiteListFlowDto importOwnerRoomDtos) { importOwnerRoomDtos.setPage((importOwnerRoomDtos.getPage()-1)* importOwnerRoomDtos.getRow()); return sqlSessionTemplate.selectList("propertyWhiteListFlowDaoImplMapper.queryPropertyWhiteListFlow",BeanConvertUtil.beanCovertMap(importOwnerRoomDtos)); if (importOwnerRoomDtos.getPage() != null && importOwnerRoomDtos.getPage() > 0 && importOwnerRoomDtos.getRow() != null) { importOwnerRoomDtos.setPage((importOwnerRoomDtos.getPage()-1)* importOwnerRoomDtos.getRow()); } return BeanConvertUtil.covertBeanList(sqlSessionTemplate.selectList("propertyWhiteListFlowDaoImplMapper.queryPropertyWhiteListFlow",BeanConvertUtil.beanCovertMap(importOwnerRoomDtos)),PropertyWhiteListFlowDto.class); } public int countPropertyWhiteListFlow(PropertyWhiteListFlowDto importOwnerRoomDtos) { service-fee/src/main/java/com/java110/fee/dao/impl/FeeDetailServiceDaoImpl.java
@@ -137,6 +137,4 @@ throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"保存明细 数据失败:"+ JSONObject.toJSONString(feeDetail)); } } } service-job/src/main/java/com/java110/job/importData/adapt/ImportHistoryFeeDetailQueueDataAdapt.java
New file @@ -0,0 +1,283 @@ package com.java110.job.importData.adapt; import com.alibaba.fastjson.JSONObject; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.PropertyWhiteListFlowDto; import com.java110.dto.fee.FeeAttrDto; import com.java110.dto.fee.FeeConfigDto; import com.java110.dto.fee.FeeDto; import com.java110.dto.importData.ImportRoomFee; import com.java110.dto.log.AssetImportLogDetailDto; import com.java110.dto.owner.OwnerRoomRelDto; import com.java110.dto.room.RoomDto; import com.java110.dto.system.ComponentValidateResult; import com.java110.intf.IImportPropertyWhiteListfFlowServiceSMO; import com.java110.intf.community.IRoomInnerServiceSMO; import com.java110.intf.fee.*; import com.java110.intf.user.IOwnerCarInnerServiceSMO; import com.java110.intf.user.IOwnerRoomRelV1InnerServiceSMO; import com.java110.job.importData.DefaultImportData; import com.java110.job.importData.IImportDataAdapt; import com.java110.po.fee.FeeAttrPo; import com.java110.po.fee.PayFeeDetailPo; import com.java110.po.fee.PayFeePo; import com.java110.utils.constant.StatusConstant; import com.java110.utils.util.BeanConvertUtil; import com.java110.utils.util.DateUtil; import com.java110.utils.util.ListUtil; import com.java110.utils.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.List; /** * 房屋缴费信息导入 适配器 * 前端请求 时 必须传入 * param.append('importAdapt', "importRoomOwner"); */ @Service("importHistoryFeeDetailQueueData") public class ImportHistoryFeeDetailQueueDataAdapt extends DefaultImportData implements IImportDataAdapt { @Autowired private IImportFeeDetailInnerServiceSMO importFeeDetailInnerServiceSMOImpl; @Autowired private IRoomInnerServiceSMO roomInnerServiceSMOImpl; @Autowired private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl; @Autowired private IFeeInnerServiceSMO feeInnerServiceSMOImpl; @Autowired private IFeeDetailInnerServiceSMO feeDetailInnerServiceSMOImpl; @Autowired private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl; @Autowired private IFeeAttrInnerServiceSMO feeAttrInnerServiceSMOImpl; @Autowired private IOwnerRoomRelV1InnerServiceSMO ownerRoomRelV1InnerServiceSMOImpl; @Autowired private IRoomInnerServiceSMO iRoomInnerServiceSMOImpl; @Override public void importData(List<AssetImportLogDetailDto> assetImportLogDetailDtos) { importDatas(assetImportLogDetailDtos); } private void importDatas(List<AssetImportLogDetailDto> infos) { List<ImportRoomFee> importRoomFees = new ArrayList<>(); for (AssetImportLogDetailDto assetImportLogDetailDto : infos) { JSONObject data = JSONObject.parseObject(assetImportLogDetailDto.getContent()); ImportRoomFee importRoomFee = BeanConvertUtil.covertBean(data, ImportRoomFee.class); RoomDto roomDto = new RoomDto(); roomDto.setDoorRoomNum(importRoomFee.getDoorRoomNum()); List<RoomDto> roomDtos = iRoomInnerServiceSMOImpl.queryRooms(roomDto); try { importRoomFee.setRoomId(roomDtos.get(0).getRoomId()); }catch (Exception e){ e.printStackTrace(); } importRoomFee.setFeeName(data.getString("secondaryFeeTypeCd")); importRoomFee.setDetailId(assetImportLogDetailDto.getDetailId()); importRoomFee.setStartTime(data.getString("chargeStart")); importRoomFee.setEndTime(data.getString("chargeEnd")); importRoomFee.setCreateTime(data.getString("inputTime")); importRoomFee.setReceivableAmount(data.getString("bankDepositAmount")); importRoomFee.setAmount(data.getString("chargeAmount")); importRoomFee.setStaffName(data.getString("charger")); importRoomFee.setOpenInv(data.containsKey("invoiceReceiptNo") && data.getString("invoiceReceiptNo") != null ? "Y" : "N"); // if(importRoomFee.getPayerObjName()) importRoomFees.add(importRoomFee); } if (ListUtil.isNull(importRoomFees)) { return; } importFeeDetails(importRoomFees.get(0).getStoreId(), importRoomFees.get(0).getUserId(), importRoomFees, importRoomFees.get(0).getBatchId()); } private void importFeeDetails(String storeId, String userId, List<ImportRoomFee> importRoomFees, String batchId) { importRoomFees = roomInnerServiceSMOImpl.freshRoomIds(importRoomFees); String endTime = ""; for (ImportRoomFee importRoomFee : importRoomFees) { endTime = importRoomFee.getEndTime(); if (!endTime.contains(":")) { endTime += " 23:59:59"; importRoomFee.setEndTime(endTime); } try { if (StringUtil.isEmpty(importRoomFee.getRoomId())) { continue; } importFeeDetail(importRoomFee, storeId, userId, batchId); updateImportLogDetailState(importRoomFee.getDetailId()); } catch (Exception e) { e.printStackTrace(); updateImportLogDetailState(importRoomFee.getDetailId(), e); } } } DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); /** * 导入 费用历史 * * @param importRoomFee */ private void importFeeDetail(ImportRoomFee importRoomFee, String storeId, String userId, String batchId) { FeeConfigDto feeConfigDto = new FeeConfigDto(); feeConfigDto.setFeeNameEq(importRoomFee.getFeeName().trim()); feeConfigDto.setCommunityId(importRoomFee.getCommunityId()); List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto); if (ListUtil.isNull(feeConfigDtos)) { return; } FeeConfigDto tmpFeeConfigDto = feeConfigDtos.get(0); FeeDto feeDto = new FeeDto(); feeDto.setConfigId(tmpFeeConfigDto.getConfigId()); feeDto.setCommunityId(importRoomFee.getCommunityId()); feeDto.setPayerObjId(importRoomFee.getRoomId()); feeDto.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM); // 解析日期字符串 LocalDateTime startDate = LocalDateTime.parse(importRoomFee.getStartTime(), formatter); LocalDateTime endDate = LocalDateTime.parse(importRoomFee.getEndTime(), formatter); importRoomFee.setCycle(String.valueOf(ChronoUnit.MONTHS.between(startDate, endDate))); List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto); List<PayFeePo> payFeePos = null; if (ListUtil.isNull(feeDtos)) { List<FeeAttrPo> feeAttrsPos = new ArrayList<>(); PayFeePo payFeePo = new PayFeePo(); payFeePo.setCommunityId(importRoomFee.getCommunityId()); payFeePo.setConfigId(feeDto.getConfigId()); payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM); payFeePo.setStartTime(importRoomFee.getStartTime()); payFeePo.setEndTime(DateUtil.getNextSecTime(importRoomFee.getEndTime())); payFeePo.setAmount(importRoomFee.getAmount()); payFeePo.setFeeFlag(tmpFeeConfigDto.getFeeFlag()); payFeePo.setFeeTypeCd(tmpFeeConfigDto.getFeeTypeCd()); payFeePo.setIncomeObjId(storeId); payFeePo.setBatchId(batchId); if (FeeDto.FEE_FLAG_ONCE.equals(tmpFeeConfigDto.getFeeFlag())) { payFeePo.setState(FeeDto.STATE_FINISH); } else { payFeePo.setState(FeeDto.STATE_DOING); } payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId)); payFeePo.setPayerObjId(importRoomFee.getRoomId()); payFeePo.setUserId(userId); payFeePo.setCreateTime(importRoomFee.getCreateTime()); payFeePos = new ArrayList<>(); payFeePos.add(payFeePo); feeInnerServiceSMOImpl.saveFee(payFeePos); //查询业主信息 OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto(); ownerRoomRelDto.setRoomId(importRoomFee.getRoomId()); List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelV1InnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto); if (ownerRoomRelDtos != null && ownerRoomRelDtos.size() > 0) { if (!FeeDto.FEE_FLAG_CYCLE.equals(tmpFeeConfigDto.getFeeFlag())) { feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME, importRoomFee.getEndTime())); } feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_OWNER_ID, ownerRoomRelDtos.get(0).getOwnerId())); feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_OWNER_LINK, ownerRoomRelDtos.get(0).getLink())); feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_OWNER_NAME, ownerRoomRelDtos.get(0).getOwnerName())); feeAttrInnerServiceSMOImpl.saveFeeAttrs(feeAttrsPos); } feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto); } for (FeeDto tmpFeeDto : feeDtos) { doImportFeeDetail(tmpFeeDto, importRoomFee); } } public FeeAttrPo addFeeAttr(PayFeePo payFeePo, String specCd, String value) { FeeAttrPo feeAttrPo = new FeeAttrPo(); feeAttrPo.setCommunityId(payFeePo.getCommunityId()); feeAttrPo.setSpecCd(specCd); feeAttrPo.setValue(value); feeAttrPo.setFeeId(payFeePo.getFeeId()); feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId)); return feeAttrPo; } private void doImportFeeDetail(FeeDto tmpFeeDto, ImportRoomFee importRoomFee) { PayFeeDetailPo payFeeDetailPo = new PayFeeDetailPo(); payFeeDetailPo.setCommunityId(importRoomFee.getCommunityId()); payFeeDetailPo.setReceivedAmount(importRoomFee.getAmount()); payFeeDetailPo.setReceivableAmount(importRoomFee.getAmount()); payFeeDetailPo.setCycles(importRoomFee.getCycle()); payFeeDetailPo.setPrimeRate("1.0"); payFeeDetailPo.setFeeId(tmpFeeDto.getFeeId()); payFeeDetailPo.setStartTime(importRoomFee.getStartTime()); payFeeDetailPo.setEndTime(importRoomFee.getEndTime()); payFeeDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId)); payFeeDetailPo.setRemark(importRoomFee.getRemark()); payFeeDetailPo.setCreateTime(importRoomFee.getCreateTime()); payFeeDetailPo.setState("1400"); payFeeDetailPo.setCashierName(importRoomFee.getStaffName()); payFeeDetailPo.setPayableAmount(importRoomFee.getAmount()); if(importRoomFee.getOpenInv() != null){ payFeeDetailPo.setOpenInvoice(importRoomFee.getOpenInv()); } int saved = feeDetailInnerServiceSMOImpl.saveFeeDetail(payFeeDetailPo); if (saved < 1) { return; } if (tmpFeeDto.getEndTime().getTime() >= DateUtil.getDateFromStringB(importRoomFee.getEndTime()).getTime()) { return; } //如果结束时间小于 缴费结束时间则延期 PayFeePo payFeePo = new PayFeePo(); payFeePo.setCommunityId(importRoomFee.getCommunityId()); payFeePo.setStatusCd(StatusConstant.STATUS_CD_VALID); payFeePo.setFeeId(tmpFeeDto.getFeeId()); payFeePo.setEndTime(DateUtil.getNextSecTime(importRoomFee.getEndTime())); if (FeeDto.FEE_FLAG_ONCE.equals(tmpFeeDto.getFeeFlag())) { payFeePo.setState(FeeDto.STATE_FINISH); } feeInnerServiceSMOImpl.updateFee(payFeePo); } } springboot/src/main/resources/application.yml
@@ -1,6 +1,6 @@ spring: profiles: active: devlocal active: debug # docker build -t lx . #