2019-09-20 12:05

src/main/java/com/jeeplus/modules/sg/overheadline/util/SettementUtil.java

@@ -894,14 +894,19 @@ public class SettementUtil {
             double moneyComparison2=money-5.0;//范围金额-5.0元
             double amout1 = Double.valueOf(amout[0]);
             double amout2 = Double.valueOf(amout[1]);
-            if (amout1>moneyComparison1&&amout1<moneyComparison2&&amout2>moneyComparison1&&amout2<moneyComparison2){
-                reason=reason1+SettementUtil.RESON_FLASE+","+","+","+reason2+SettementUtil.RESON_FLASE;
-            }
-            if(amout1!=amout2&&amout1<=moneyComparison1&&amout1>=moneyComparison2){
-                reason=reason1+SettementUtil.RESON_TRUE+","+","+","+reason2+SettementUtil.RESON_FLASE;
+            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 (amout1>moneyComparison1&&amout1<moneyComparison2&&amout1==amout2){
-                reason=reason1+SettementUtil.RESON_TRUE+","+","+","+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;
@@ -932,14 +937,28 @@ public class SettementUtil {
             double amout2 = Double.valueOf(amout[1]);
             double moneyComparison1=money+5.0;//范围金额+5.0元
             double moneyComparison2=money-5.0;//范围金额-5.0元
-            if (amout1>moneyComparison1&&amout1<moneyComparison2&&amout2>moneyComparison1&&amout2<moneyComparison2){
-                reason=reason1+SettementUtil.RESON_FLASE+","+","+","+reason2+SettementUtil.RESON_FLASE;
-            }
-            if(money!=amout2&&amout1<=moneyComparison1&&amout1>=moneyComparison2){
-                reason=reason1+SettementUtil.RESON_TRUE+","+","+","+reason2+SettementUtil.RESON_FLASE;
+//            if (amout1>moneyComparison1&&amout1<moneyComparison2&&amout2>moneyComparison1&&amout2<moneyComparison2){
+//                reason=reason1+SettementUtil.RESON_FLASE+","+","+","+reason2+SettementUtil.RESON_FLASE;
+//            }
+//            if(money!=amout2&&amout1<=moneyComparison1&&amout1>=moneyComparison2){
+//                reason=reason1+SettementUtil.RESON_TRUE+","+","+","+reason2+SettementUtil.RESON_FLASE;
+//            }
+//            if (money!=amout1&&amout2<=moneyComparison1&&amout2>=moneyComparison2){
+//                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 (money!=amout1&&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;