service-community/src/main/java/com/java110/community/cmd/ownerRepair/RepairFinishCmd.java
@@ -138,7 +138,7 @@ String repairMaterial = ""; //费用明细(单价 * 数量 = 总价) String repairFee = ""; if (ListUtil.isNull(json) && ("1001".equals(maintenanceType) || "1003".equals(maintenanceType))) { if (!ListUtil.isNull(json) && ("1001".equals(maintenanceType) || "1003".equals(maintenanceType))) { Object[] objects = json.toArray(); //数据前期校验 for (int i = 0; i < objects.length; i++) { service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java
@@ -485,7 +485,7 @@ payFeePo.setEndTime(df.format(cal.getTime())); BigDecimal value = new BigDecimal(payFeeDetailPo.getGiftAmount()); value = value.add(new BigDecimal(specValue).multiply(new BigDecimal((double)feePriceMap.get("feePrice")))); value = value.add(new BigDecimal(specValue).multiply(new BigDecimal(feePriceMap.get("feePrice").toString()))); payFeeDetailPo.setGiftAmount(value.doubleValue() + ""); } } service-fee/src/main/java/com/java110/fee/smo/impl/FeeDiscountInnerServiceSMOImpl.java
@@ -197,7 +197,7 @@ //查询打折表 List<FeeDiscountDto> feeDiscountInfo = BeanConvertUtil.covertBeanList(feeDiscountServiceDaoImpl.getFeeDiscountInfo(BeanConvertUtil.beanCovertMap(feeDiscountDto)), FeeDiscountDto.class); //Assert.listOnlyOne(feeDiscountInfo, "查询打折表错误！"); if(!ListUtil.isNull(feeDiscountInfo)){ if(ListUtil.isNull(feeDiscountInfo)){ continue; } FeeDiscountRuleDto feeDiscountRuleDto = new FeeDiscountRuleDto(); @@ -205,7 +205,7 @@ //查询打折规则表 List<FeeDiscountRuleDto> feeDiscountRuleDtos = feeDiscountRuleInnerServiceSMOImpl.queryFeeDiscountRules(feeDiscountRuleDto); //Assert.listOnlyOne(feeDiscountRuleDtos, "查询打折规则表错误！"); if(!ListUtil.isNull(feeDiscountRuleDtos)){ if(ListUtil.isNull(feeDiscountRuleDtos)){ continue; } if (!StringUtil.isEmpty(feeDiscountRuleDtos.get(0).getBeanImpl()) && feeDiscountRuleDtos.get(0).getBeanImpl().equals("reductionMonthFeeRule")) { //赠送规则 @@ -215,7 +215,7 @@ //查询打折规格 List<FeeDiscountSpecDto> feeDiscountSpecDtos = feeDiscountSpecInnerServiceSMOImpl.queryFeeDiscountSpecs(feeDiscountSpecDto); //Assert.listOnlyOne(feeDiscountSpecDtos, "查询打折规格表错误！"); if(!ListUtil.isNull(feeDiscountSpecDtos)){ if(ListUtil.isNull(feeDiscountSpecDtos)){ continue; } //获取赠送月份 service-job/src/main/java/com/java110/job/task/inspection/GeneratorInspectionTaskTemplate.java
@@ -200,7 +200,7 @@ int beforeTime = Integer.parseInt(tmpInspectionPlanDto.getBeforeTime()); String planTime = DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B) + " " + tmpInspectionPlanDto.getStartTime(); String planTime = DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B) + " " + tmpInspectionPlanDto.getStartTime()+":00"; Calendar calendar = Calendar.getInstance(); calendar.setTime(DateUtil.getDateFromStringA(planTime));
