java110-bean/src/main/java/com/java110/dto/feeDiscount/ComputeDiscountDto.java
@@ -30,6 +30,8 @@ private String discountType; private String discountName; private String ruleName; private String ruleId; @@ -86,4 +88,12 @@ public void setDiscountType(String discountType) { this.discountType = discountType; } public String getDiscountName() { return discountName; } public void setDiscountName(String discountName) { this.discountName = discountName; } } service-api/src/main/java/com/java110/api/listener/complaint/ListComplaintsListener.java
@@ -77,11 +77,13 @@ @Override protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) { ComplaintDto complaintDto = BeanConvertUtil.covertBean(reqJson, ComplaintDto.class); if (reqJson.containsKey("roomIds")) { String[] roomIds = reqJson.getString("roomIds").split(","); reqJson.put("roomIds",roomIds); complaintDto.setRoomIds(roomIds); } ComplaintDto complaintDto = BeanConvertUtil.covertBean(reqJson, ComplaintDto.class); int count = complaintInnerServiceSMOImpl.queryComplaintsCount(complaintDto); service-fee/src/main/java/com/java110/fee/discount/impl/DiscountFeeRule.java
@@ -88,14 +88,14 @@ BigDecimal cycleDec = new BigDecimal(feeDiscountDto.getCycles()); double discountPrice = priceDec.multiply(cycleDec).multiply(new BigDecimal(rate)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue(); double discountPrice = priceDec.multiply(cycleDec).multiply(new BigDecimal(1.0 - rate)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue(); ComputeDiscountDto computeDiscountDto = new ComputeDiscountDto(); computeDiscountDto.setDiscountId(feeDiscountDto.getDiscountId()); computeDiscountDto.setDiscountType(FeeDiscountDto.DISCOUNT_TYPE_D); computeDiscountDto.setRuleId(feeDiscountDto.getRuleId()); computeDiscountDto.setRuleName(feeDiscountDto.getRuleName()); computeDiscountDto.setDiscountName(feeDiscountDto.getDiscountName()); computeDiscountDto.setDiscountPrice(discountPrice); computeDiscountDto.setFeeDiscountSpecs(feeDiscountSpecDtos); return computeDiscountDto; service-fee/src/main/java/com/java110/fee/discount/impl/LateFeeByDayRule.java
@@ -93,6 +93,7 @@ computeDiscountDto.setDiscountType(FeeDiscountDto.DISCOUNT_TYPE_V); computeDiscountDto.setRuleId(feeDiscountDto.getRuleId()); computeDiscountDto.setRuleName(feeDiscountDto.getRuleName()); computeDiscountDto.setDiscountName(feeDiscountDto.getDiscountName()); computeDiscountDto.setDiscountPrice(discountPrice); computeDiscountDto.setFeeDiscountSpecs(feeDiscountSpecDtos); return computeDiscountDto; service-fee/src/main/java/com/java110/fee/discount/impl/LateFeeByMonthRule.java
@@ -89,6 +89,7 @@ computeDiscountDto.setDiscountType(FeeDiscountDto.DISCOUNT_TYPE_V); computeDiscountDto.setRuleId(feeDiscountDto.getRuleId()); computeDiscountDto.setRuleName(feeDiscountDto.getRuleName()); computeDiscountDto.setDiscountName(feeDiscountDto.getDiscountName()); computeDiscountDto.setDiscountPrice(discountPrice); computeDiscountDto.setFeeDiscountSpecs(feeDiscountSpecDtos); return computeDiscountDto; service-fee/src/main/java/com/java110/fee/discount/impl/ReductionFeeRule.java
@@ -81,6 +81,7 @@ computeDiscountDto.setDiscountType(FeeDiscountDto.DISCOUNT_TYPE_D); computeDiscountDto.setRuleId(feeDiscountDto.getRuleId()); computeDiscountDto.setRuleName(feeDiscountDto.getRuleName()); computeDiscountDto.setDiscountName(feeDiscountDto.getDiscountName()); computeDiscountDto.setDiscountPrice(discountPrice); computeDiscountDto.setFeeDiscountSpecs(feeDiscountSpecDtos); return computeDiscountDto; service-fee/src/main/java/com/java110/fee/smo/impl/FeeDiscountInnerServiceSMOImpl.java
@@ -144,7 +144,7 @@ PayFeeConfigDiscountDto payFeeConfigDiscountDto = new PayFeeConfigDiscountDto(); payFeeConfigDiscountDto.setConfigId(feeDtos.get(0).getConfigId()); payFeeConfigDiscountDto.setRow(feeDetailDto.getRow()); payFeeConfigDiscountDto.setPage(feeDetailDto.getRow()); payFeeConfigDiscountDto.setPage(feeDetailDto.getPage()); payFeeConfigDiscountDto.setCommunityId(feeDetailDto.getCommunityId()); List<PayFeeConfigDiscountDto> payFeeConfigDiscountDtos = payFeeConfigDiscountInnerServiceSMOImpl.queryPayFeeConfigDiscounts(payFeeConfigDiscountDto);