|
|
@@ -197,7 +197,7 @@ public class FeeDiscountInnerServiceSMOImpl extends BaseServiceSMO implements IF
|
|
|
//查询打折表
|
|
|
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 @@ public class FeeDiscountInnerServiceSMOImpl extends BaseServiceSMO implements IF
|
|
|
//查询打折规则表
|
|
|
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 @@ public class FeeDiscountInnerServiceSMOImpl extends BaseServiceSMO implements IF
|
|
|
//查询打折规格
|
|
|
List<FeeDiscountSpecDto> feeDiscountSpecDtos = feeDiscountSpecInnerServiceSMOImpl.queryFeeDiscountSpecs(feeDiscountSpecDto);
|
|
|
//Assert.listOnlyOne(feeDiscountSpecDtos, "查询打折规格表错误!");
|
|
|
- if(!ListUtil.isNull(feeDiscountSpecDtos)){
|
|
|
+ if(ListUtil.isNull(feeDiscountSpecDtos)){
|
|
|
continue;
|
|
|
}
|
|
|
//获取赠送月份
|