Skip to content

C
clx-performance
提交 c56d9a3d authored 作者: aiqingguo's avatar aiqingguo
浏览文件
操作

积分范围增加%

上级 e7c57813
隐藏空白字符变更
内嵌 并排
正在显示 包含 5 行增加 和 5 行删除
performance-api/src/main/java/com/clx/performance/vo/pc/integral/AppIntegralTruckRuleVO.java
浏览文件 @ c56d9a3d
...@@ -36,9 +36,9 @@ public class AppIntegralTruckRuleVO { ...@@ -36,9 +36,9 @@ public class AppIntegralTruckRuleVO {
@ApiModelProperty(value = "积分结束范围", example = "") @ApiModelProperty(value = "积分结束范围", example = "")
private String integralRatioMsg; private String integralRatioMsg;
public String getIntegralRatioMsg() { public String getIntegralRatioMsg() {
if (integralRatioBegin == null && integralRatioEnd !=null) {return "积分小于"+integralRatioEnd;} if (integralRatioBegin == null && integralRatioEnd !=null) {return "积分小于"+integralRatioEnd+"%";}
if (integralRatioEnd == null && integralRatioBegin !=null) {return "积分大于"+integralRatioBegin;} if (integralRatioEnd == null && integralRatioBegin !=null) {return "积分大于"+integralRatioBegin+"%";}
return "积分"+ integralRatioBegin + "—" + integralRatioEnd; return "积分"+ integralRatioBegin+"%" + "—" + integralRatioEnd+"%";
} }
@ApiModelProperty(value = "状态：1开启 2关闭", example = "") @ApiModelProperty(value = "状态：1开启 2关闭", example = "")
......
performance-web/src/main/java/com/clx/performance/service/impl/integral/IntegralTruckRuleServiceImpl.java
浏览文件 @ c56d9a3d
...@@ -49,7 +49,7 @@ public class IntegralTruckRuleServiceImpl implements IntegralTruckRuleService { ...@@ -49,7 +49,7 @@ public class IntegralTruckRuleServiceImpl implements IntegralTruckRuleService {
if (list.get(list.size()-1).getIntegralRatioEnd() == null if (list.get(list.size()-1).getIntegralRatioEnd() == null
|| list.get(list.size()-1).getIntegralRatioEnd() == 100){list.get(list.size()-1).setIntegralRatioEnd(101);} || list.get(list.size()-1).getIntegralRatioEnd() == 100){list.get(list.size()-1).setIntegralRatioEnd(101);}
if (param.getIntegralRatioBegin() == null) {param.setIntegralRatioEnd(0);} if (param.getIntegralRatioBegin() == null) {param.setIntegralRatioBegin(0);}
if (param.getIntegralRatioEnd() == null){param.setIntegralRatioEnd(100);} if (param.getIntegralRatioEnd() == null){param.setIntegralRatioEnd(100);}
for (IntegralTruckRule item : list) { for (IntegralTruckRule item : list) {
...@@ -98,7 +98,7 @@ public class IntegralTruckRuleServiceImpl implements IntegralTruckRuleService { ...@@ -98,7 +98,7 @@ public class IntegralTruckRuleServiceImpl implements IntegralTruckRuleService {
if (list.get(list.size()-1).getIntegralRatioEnd() == null if (list.get(list.size()-1).getIntegralRatioEnd() == null
|| list.get(list.size()-1).getIntegralRatioEnd() == 100){list.get(list.size()-1).setIntegralRatioEnd(101);} || list.get(list.size()-1).getIntegralRatioEnd() == 100){list.get(list.size()-1).setIntegralRatioEnd(101);}
if (param.getIntegralRatioBegin() == null) {param.setIntegralRatioEnd(0);} if (param.getIntegralRatioBegin() == null) {param.setIntegralRatioBegin(0);}
if (param.getIntegralRatioEnd() == null){param.setIntegralRatioEnd(100);} if (param.getIntegralRatioEnd() == null){param.setIntegralRatioEnd(100);}
for (IntegralTruckRule item : list) { for (IntegralTruckRule item : list) {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论