java110-bean/src/main/java/com/java110/dto/importData/ImportRoomFee.java
@@ -72,6 +72,16 @@ private String payObjId; private String invoiceNo; public String getInvoiceNo() { return invoiceNo; } public void setInvoiceNo(String invoiceNo) { this.invoiceNo = invoiceNo; } public String getPayObjId() { return payObjId; } java110-db/src/main/resources/mapper/store/ContractPartyaServiceDaoImplMapper.xml
@@ -16,7 +16,7 @@ from contract_partya t where 1 =1 <if test="partyA !=null and partyA != ''"> and t.party_a like concat('%',#{partyA},'%') and t.party_a = #{partyA} </if> <if test="isPartyA !=null and isPartyA != ''"> and t.party_a = #{isPartyA} @@ -84,7 +84,7 @@ from contract_partya t where 1 =1 <if test="partyA !=null and partyA != ''"> and t.party_a like concat('%',#{partyA},'%') and t.party_a = #{partyA} </if> <if test="aLink !=null and aLink != ''"> and t.a_link= #{aLink} service-acct/src/main/java/com/java110/acct/cmd/payment/CashierCmd.java
@@ -143,6 +143,7 @@ // redis 中 保存 请求参数 reqJson.put("remark","线上小程序业主端支付"); CommonCache.setValue("unifiedPayment_" + paymentOrderDto.getOrderId(), reqJson.toJSONString(), CommonCache.PAY_DEFAULT_EXPIRE_TIME); }
@@ -139,6 +139,7 @@ reqJson.put("money", paymentOrderDto.getMoney()); // redis 中 保存 请求参数 reqJson.put("remark", "物业端二维码扫码支付"); CommonCache.setValue("nativeQrcodePayment_" + paymentOrderDto.getOrderId(), reqJson.toJSONString(), CommonCache.PAY_DEFAULT_EXPIRE_TIME); JSONObject result = new JSONObject();
@@ -35,6 +35,7 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -221,6 +222,9 @@ String order = CommonCache.getAndRemoveValue(FeeDto.REDIS_PAY_OWE_FEE + paymentOrderDto.getOrderId()); JSONObject paramIn = JSONObject.parseObject(order); if (reqJson.containsKey("remark")) { paramIn.put("remark",reqJson.getString("remark")); } paramIn.put("oId", paymentOrderDto.getOrderId()); freshFees(paramIn); JSONObject paramOut = CallApiServiceFactory.postForApi(paymentOrderDto.getAppId(), paramIn, "fee.payOweFee", JSONObject.class, paramIn.getString("userId")); @@ -239,7 +243,7 @@ fee = fees.getJSONObject(feeIndex); if (fee.containsKey("deadlineTime")) { fee.put("startTime", DateUtil.getFormatTimeString(fee.getDate("endTime"), DateUtil.DATE_FORMATE_STRING_A)); fee.put("endTime", DateUtil.getFormatTimeString(fee.getDate("deadlineTime"), DateUtil.DATE_FORMATE_STRING_A)); fee.put("endTime", DateUtil.getAddHoursStringA(fee.getDate("deadlineTime"), -1).split(" ")[0] + " 23:59:59"); fee.put("receivedAmount", fee.getString("feeTotalPrice")); fee.put("state", ""); } service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java
@@ -970,7 +970,7 @@ tmpPayFeeDetailPo.setReceivedAmount("0"); tmpPayFeeDetailPo.setPayableAmount("0"); tmpPayFeeDetailPo.setStartTime(DateUtil.getFormatTimeStringB(payFeePo.getEndTime())); tmpPayFeeDetailPo.setEndTime(DateUtil.getAddDayString(payFeeDetailPo.getStartTime(),"yyyy-MM-dd HH:mm:ss",-1)); tmpPayFeeDetailPo.setEndTime(DateUtil.getAddDayString(payFeeDetailPo.getStartTime(),"yyyy-MM-dd HH:mm:ss",-1).split(" ")[0] + "23:59:59"); tmpPayFeeDetailPo.setState(FeeDetailDto.STATE_OWE); tmpPayFeeDetailPo.setOpenInvoice("N"); tmpPayFeeDetailPo.setRemark("按缴费时间段缴费,这部分费用按欠费的方式重新生成，请在" + payObjNameRemark + "上查看"); service-fee/src/main/java/com/java110/fee/cmd/fee/PayOweFeeCmd.java
@@ -187,6 +187,10 @@ && FeeDetailDto.PRIME_REATE_WECHAT_APP.equals(feeObj.getString("primeRate"))) { feeObj.put("remark", "线上小程序支付"); } if (paramObj.containsKey("remark")) { feeObj.put("remark", paramObj.getString("remark")); } feeObj.put("state", "1400"); // todo 添加交费明细 addOweFeeDetail(feeObj, details, userDto, receiptCode, payOrderId); service-fee/src/main/java/com/java110/fee/cmd/fee/SaveContractCreateFeeCmd.java
@@ -129,7 +129,7 @@ contractDto.setContractId(reqJson.getString("contractId")); contractDto.setStoreId(storeId); //contractDto.setCommunityId(reqJson.getString("communityId")); contractDto.setCommunityId(reqJson.getString("communityId")); contractDtos = contractInnerServiceSMOImpl.queryContracts(contractDto); if (contractDtos == null || contractDtos.size() < 1) { service-job/src/main/java/com/java110/job/export/adapt/WhiteOrderReportFeeAdapt.java
@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; import java.util.List; import java.util.Map; @@ -24,7 +25,7 @@ * @author fqz * @date 2023-12-14 13:52 */ @Service(value = "applyRoomDiscount") @Service(value = "whiteOrderReportDiscount") public class WhiteOrderReportFeeAdapt implements IExportDataAdapt { @Autowired @@ -84,6 +85,9 @@ FeeQueryParams feeQueryParams = BeanConvertUtil.covertBean(reqJson, FeeQueryParams.class); feeQueryParams.setPage(1); feeQueryParams.setRow(MAX_ROW); feeQueryParams.setCommunityId(reqJson.getString("communityId")); feeQueryParams.setEndYear(new Date().getYear()); feeQueryParams.setStartYear(2020); List<Map> applyRoomDiscounts = reportFeeInnerServiceSMOImpl.repostPaidInFeeByWhiteOrder(feeQueryParams); appendData(applyRoomDiscounts, sheet); } @@ -93,33 +97,34 @@ for (int index = 0; index < applyRoomDiscounts.size(); index++) { row = sheet.createRow(index + 1); Map applyRoomDiscountDto = applyRoomDiscounts.get(index); row.createCell(0).setCellValue(applyRoomDiscountDto.get("row1").toString()); row.createCell(1).setCellValue(applyRoomDiscountDto.getDiscountId()); row.createCell(2).setCellValue(applyRoomDiscountDto.getDiscountName()); row.createCell(3).setCellValue(applyRoomDiscountDto.getApplyTypeName()); row.createCell(4).setCellValue(applyRoomDiscountDto.getCreateUserName()); row.createCell(5).setCellValue(applyRoomDiscountDto.getCreateUserTel()); row.createCell(6).setCellValue(applyRoomDiscountDto.getStartTime()); row.createCell(7).setCellValue(applyRoomDiscountDto.getEndTime()); row.createCell(8).setCellValue(applyRoomDiscountDto.getStateName()); row.createCell(9).setCellValue(applyRoomDiscountDto.getCreateTime()); if (!StringUtil.isEmpty(applyRoomDiscountDto.getInUse()) && applyRoomDiscountDto.getInUse().equals("0")) { row.createCell(10).setCellValue("未使用"); } else { row.createCell(10).setCellValue("已使用"); } if (!StringUtil.isEmpty(applyRoomDiscountDto.getDiscountId()) && "1002".equals(applyRoomDiscountDto.getReturnWay())) { row.createCell(11).setCellValue("账户余额"); } else if (!StringUtil.isEmpty(applyRoomDiscountDto.getDiscountId()) && !"1002".equals(applyRoomDiscountDto.getReturnWay())) { row.createCell(11).setCellValue("折扣"); } else { row.createCell(11).setCellValue("--"); } if (!StringUtil.isEmpty(applyRoomDiscountDto.getReturnAmount())) { row.createCell(12).setCellValue(applyRoomDiscountDto.getReturnAmount()); } else { row.createCell(12).setCellValue("--"); } row.createCell(0).setCellValue(applyRoomDiscountDto.get("row2") != null ? applyRoomDiscountDto.get("row1").toString() : ""); row.createCell(1).setCellValue(applyRoomDiscountDto.get("row2") != null ? applyRoomDiscountDto.get("row2").toString() : ""); row.createCell(2).setCellValue(applyRoomDiscountDto.get("row3") != null ? applyRoomDiscountDto.get("row3").toString() : ""); row.createCell(3).setCellValue(applyRoomDiscountDto.get("row4") != null ? applyRoomDiscountDto.get("row4").toString() : ""); row.createCell(4).setCellValue(applyRoomDiscountDto.get("row5") != null ? applyRoomDiscountDto.get("row5").toString() : ""); row.createCell(5).setCellValue(applyRoomDiscountDto.get("row6") != null ? applyRoomDiscountDto.get("row6").toString() : ""); row.createCell(6).setCellValue(applyRoomDiscountDto.get("row7") != null ? applyRoomDiscountDto.get("row7").toString() : ""); row.createCell(7).setCellValue(applyRoomDiscountDto.get("row8") != null ? applyRoomDiscountDto.get("row8").toString() : ""); row.createCell(8).setCellValue(applyRoomDiscountDto.get("row9") != null ? applyRoomDiscountDto.get("row9").toString() : ""); row.createCell(9).setCellValue(applyRoomDiscountDto.get("row10") != null ? applyRoomDiscountDto.get("row10").toString() : ""); row.createCell(10).setCellValue(applyRoomDiscountDto.get("row11") != null ? applyRoomDiscountDto.get("row11").toString() : ""); row.createCell(11).setCellValue(applyRoomDiscountDto.get("row12") != null ? applyRoomDiscountDto.get("row12").toString() : ""); row.createCell(12).setCellValue(applyRoomDiscountDto.get("row13") != null ? applyRoomDiscountDto.get("row13").toString() : ""); row.createCell(13).setCellValue(applyRoomDiscountDto.get("row14") != null ? applyRoomDiscountDto.get("row14").toString() : ""); row.createCell(14).setCellValue(applyRoomDiscountDto.get("row15") != null ? applyRoomDiscountDto.get("row15").toString() : ""); row.createCell(15).setCellValue(applyRoomDiscountDto.get("row16") != null ? applyRoomDiscountDto.get("row16").toString() : ""); row.createCell(16).setCellValue(applyRoomDiscountDto.get("row17") != null ? applyRoomDiscountDto.get("row17").toString() : ""); row.createCell(17).setCellValue(applyRoomDiscountDto.get("row18") != null ? applyRoomDiscountDto.get("row18").toString() : ""); row.createCell(18).setCellValue(applyRoomDiscountDto.get("row19") != null ? applyRoomDiscountDto.get("row19").toString() : ""); row.createCell(19).setCellValue(applyRoomDiscountDto.get("row20") != null ? applyRoomDiscountDto.get("row20").toString() : ""); row.createCell(20).setCellValue(applyRoomDiscountDto.get("row21") != null ? applyRoomDiscountDto.get("row21").toString() : ""); row.createCell(21).setCellValue(applyRoomDiscountDto.get("row22") != null ? applyRoomDiscountDto.get("row22").toString() : ""); row.createCell(22).setCellValue(applyRoomDiscountDto.get("row23") != null ? applyRoomDiscountDto.get("row23").toString() : ""); row.createCell(23).setCellValue(applyRoomDiscountDto.get("row24") != null ? applyRoomDiscountDto.get("row24").toString() : ""); row.createCell(24).setCellValue(applyRoomDiscountDto.get("row25") != null ? applyRoomDiscountDto.get("row25").toString() : ""); row.createCell(25).setCellValue(applyRoomDiscountDto.get("row26") != null ? applyRoomDiscountDto.get("row26").toString() : ""); row.createCell(26).setCellValue(applyRoomDiscountDto.get("row27") != null ? applyRoomDiscountDto.get("row27").toString() : ""); row.createCell(27).setCellValue(applyRoomDiscountDto.get("row28") != null ? applyRoomDiscountDto.get("row28").toString() : ""); } } } service-job/src/main/java/com/java110/job/importData/adapt/ImportCarHistoryFeeDetailQueueDataAdapt.java
@@ -186,6 +186,7 @@ try { if (importRoomFee.getPayObjId() != null && importRoomFee.getPayObjId().equals("7777")){ ContractPartyaDto contractPartyaDto = new ContractPartyaDto(); contractPartyaDto.setCommunityId(importRoomFee.getCommunityId()); contractPartyaDto.setPartyA(importRoomFee.getDoorRoomNum()); List<ContractPartyaDto> contractPartyaDtos = contractPartyaInnerServiceSMOImpl.queryContractPartyas(contractPartyaDto); if (contractPartyaDtos != null && contractPartyaDtos.size() > 0) { service-job/src/main/java/com/java110/job/importData/adapt/ImportHistoryFeeDetailQueueDataAdapt.java
@@ -151,6 +151,7 @@ FeeConfigDto feeConfigDto = new FeeConfigDto(); feeConfigDto.setFeeName(data.getString("secondaryFeeTypeCd")); feeConfigDto.setFeeTypeCds(new String[]{"630000007","630000017"}); importRoomFee.setInvoiceNo(data.getString("invoiceReceiptNo")); List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto); if(feeConfigDtos.size() > 0){ for(FeeConfigDto feeConfigDto1 : feeConfigDtos){ @@ -415,10 +416,12 @@ } }else { ContractPartyaDto contractPartyaDto = new ContractPartyaDto(); contractPartyaDto.setCommunityId(importRoomFee.getCommunityId()); contractPartyaDto.setPartyA(importRoomFee.getDoorRoomNum()); List<ContractPartyaDto> contractPartyaDtos = contractPartyaInnerServiceSMOImpl.queryContractPartyas(contractPartyaDto); if (contractPartyaDtos != null && contractPartyaDtos.size() > 0) { ContractDto contractDto = new ContractDto(); contractDto.setCommunityId(importRoomFee.getCommunityId()); contractDto.setContractCode(importRoomFee.getContractId()); List<ContractDto> contractDtos = contractInnerServiceSMOImpl.queryContracts(contractDto); if (contractDtos.size() == 0) { @@ -540,6 +543,7 @@ payFeeDetailPo.setCycles(cycle+""); payFeeDetailPo.setEndTime(importRoomFee.getEndTime()); if (count > 0) { throw new IllegalStateException("重复的缴费记录"); } PayFeeDetailDiscountPo payFeeDetailDiscount = new PayFeeDetailDiscountPo(); @@ -576,8 +580,8 @@ payFeeDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId)); if(importRoomFee.getOpenInv() != null){ payFeeDetailPo.setOpenInvoice(importRoomFee.getOpenInv()); if(importRoomFee.getInvoiceNo() != null){ payFeeDetailPo.setOpenInvoice(importRoomFee.getInvoiceNo()); } int saved = feeDetailInnerServiceSMOImpl.saveFeeDetail(payFeeDetailPo);
@@ -146,7 +146,7 @@ importExportMeterWaterDto.setMeterType(meterType); //查询房屋是否有合同 ContractRoomDto contractRoomDto = new ContractRoomDto(); contractRoomDto.setCommunityId(communityId); contractRoomDto.setRoomId(roomDtos.get(0).getRoomId()); List<ContractRoomDto> contractRoomDtos = contractRoomInnerServiceSMOImpl.queryContractRooms(contractRoomDto); service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomFeeQueueDataAdapt.java
@@ -272,6 +272,7 @@ payFeePo.setConfigId(feeConfigDtos.get(0).getConfigId()); if (FeeDto.PAYER_OBJ_TYPE_CONTRACT.equals(importRoomFee.getObjType())) { ContractDto contractDto = new ContractDto(); contractDto.setCommunityId(importRoomFee.getCommunityId()); contractDto.setContractCode(importRoomFee.getContractId()); List<ContractDto> contractDtos = iContractInnerServiceSMO.queryContracts(contractDto); if(contractDtos.size() == 0){ @@ -282,11 +283,12 @@ payFeePo.setContractFee(contractDtos.get(0).getContractId()); // payFeePo.setCreateTime(importFeeDetailPo.getC); ContractPartyaDto contractPartyaDto = new ContractPartyaDto(); contractPartyaDto.setCommunityId(importRoomFee.getCommunityId()); if(importRoomFee.getPayerObjName() == null || Objects.equals(importRoomFee.getPayerObjName(), "")){//当没写入主体时 contractPartyaDto.setPartyaId(contractDtos.get(0).getbPartyaId()); } else{//写入了 contractPartyaDto.setPartyA(importRoomFee.getPayerObjName()); contractPartyaDto.setIsPartyA(importRoomFee.getPayerObjName()); } List<ContractPartyaDto> contractPartyaDtos = iContractPartyaInnerServiceSMO.queryContractPartyas(contractPartyaDto); if (ListUtil.isNull(contractPartyaDtos)) { springboot/src/main/resources/application.yml
@@ -1,6 +1,6 @@ spring: profiles: active: debug active: dev import: line:
