|
@@ -997,21 +997,6 @@ public class SettementUtil {
|
|
|
if (amout1!=money && amout2 == money){
|
|
|
reason=reason1+SettementUtil.RESON_FLASE+","+","+","+reason2+SettementUtil.RESON_TRUE;
|
|
|
}
|
|
|
-// //重写判断
|
|
|
-// if (amout1>=moneyComparison1||amout1<=moneyComparison2){
|
|
|
-// if (amout2>=moneyComparison1||amout2<=moneyComparison2){
|
|
|
-// reason=reason1+SettementUtil.RESON_FLASE+","+","+","+reason2+SettementUtil.RESON_FLASE;
|
|
|
-// }
|
|
|
-// if(amout2<=moneyComparison1&&amout2>=moneyComparison2){
|
|
|
-// reason=reason1+SettementUtil.RESON_FLASE+","+","+","+reason2+SettementUtil.RESON_TRUE;
|
|
|
-// }
|
|
|
-//
|
|
|
-// }
|
|
|
-// if (amout2>=moneyComparison1||amout2<=moneyComparison2){
|
|
|
-// if(amout1<=moneyComparison1&&amout1>=moneyComparison2){
|
|
|
-// reason=reason1+SettementUtil.RESON_TRUE+","+","+","+reason2+SettementUtil.RESON_FLASE;
|
|
|
-// }
|
|
|
-// }
|
|
|
}
|
|
|
return reason; //最终分部分项提示信息
|
|
|
}
|
|
@@ -1050,21 +1035,6 @@ public class SettementUtil {
|
|
|
if (amout1!=money && amout2 == money){
|
|
|
reason=reason1+SettementUtil.RESON_FLASE+","+","+","+reason2+SettementUtil.RESON_TRUE;
|
|
|
}
|
|
|
-// //判断 不一致 地方 拼接不同常量
|
|
|
-// if (amout1>=moneyComparison1||amout1<=moneyComparison2){
|
|
|
-// if (amout2>=moneyComparison1||amout2<=moneyComparison2){
|
|
|
-// reason=reason1+SettementUtil.RESON_FLASE+","+","+","+reason2+SettementUtil.RESON_FLASE;
|
|
|
-// }
|
|
|
-// if(amout2<=moneyComparison1&&amout2>=moneyComparison2){
|
|
|
-// reason=reason1+SettementUtil.RESON_FLASE+","+","+","+reason2+SettementUtil.RESON_TRUE;
|
|
|
-// }
|
|
|
-//
|
|
|
-// }
|
|
|
-// if (amout2>=moneyComparison1||amout2<=moneyComparison2){
|
|
|
-// if(amout1<=moneyComparison1&&amout1>=moneyComparison2){
|
|
|
-// reason=reason1+SettementUtil.RESON_TRUE+","+","+","+reason2+SettementUtil.RESON_FLASE;
|
|
|
-// }
|
|
|
-// }
|
|
|
}
|
|
|
return reason;
|
|
|
}
|