Commit 0335d905 by 裴大威

Merge branch 'fix-rsy-1022629' into 'master'

fixbug1022629

See merge request rays/pcloud-book!633
parents 9f397c42 9c08bc35
...@@ -496,7 +496,7 @@ public class CultivateBizImpl implements CultivateBiz { ...@@ -496,7 +496,7 @@ public class CultivateBizImpl implements CultivateBiz {
Integer hour=(-cultivateRecord.getEnergyChange())/60; Integer hour=(-cultivateRecord.getEnergyChange())/60;
Integer min=(-cultivateRecord.getEnergyChange())%60; Integer min=(-cultivateRecord.getEnergyChange())%60;
if(hour>0) { if(hour>0) {
cultivateRecord.setRemark("你已使用" + (-cultivateRecord.getEnergyChange()) + "能量值点亮" + hour + "小时" + min + "分钟"); cultivateRecord.setRemark("你已使用" + (-cultivateRecord.getEnergyChange()) + "能量值点亮" + hour + "小时" + (min != 0 ? min + "分钟" : ""));
}else{ }else{
cultivateRecord.setRemark("你已使用" + (-cultivateRecord.getEnergyChange()) + "能量值点亮" + min + "分钟"); cultivateRecord.setRemark("你已使用" + (-cultivateRecord.getEnergyChange()) + "能量值点亮" + min + "分钟");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment