修改

YijiaRestful/src/main/java/com/platform/yijia/controller/PayOrderController.java

@@ -603,8 +603,13 @@ public class PayOrderController {
                         case "1":   //按加油升数
                             if(oilLiters.compareTo(discountAmt_B) ==1 || oilLiters.compareTo(discountAmt_B) ==0 ){
                                 discountPrice = oilPrice.subtract(new BigDecimal(labelRuleDetailList.get(0).getDiscountLitersAmt()));
-                                amt = discountPrice.multiply(oilLiters);
-                                discountAmt = receivableAmt.subtract(amt);
+                                if(oilPrice.compareTo(discountPrice) == 0){
+                                    amt = receivableAmt;
+                                    discountAmt = new BigDecimal("0.00");
+                                }else {
+                                    amt = discountPrice.multiply(oilLiters);
+                                    discountAmt = receivableAmt.subtract(amt);
+                                }
                                 //discountAmt = oilLiters.multiply(new BigDecimal(labelRuleDetailList.get(0).getDiscountLitersAmt()));
                                 discountAmt = discountAmt.setScale(2, BigDecimal.ROUND_HALF_UP);
                             }
@@ -612,8 +617,15 @@ public class PayOrderController {
                         case "2":   //按加油金额
                             if(receivableAmt.compareTo(discountAmt_B) ==1 || receivableAmt.compareTo(discountAmt_B) ==0 ){
                                 discountPrice = oilPrice.subtract(new BigDecimal(labelRuleDetailList.get(0).getDiscountLitersAmt()));
-                                amt = discountPrice.multiply(oilLiters);
-                                discountAmt = receivableAmt.subtract(amt);
+                                if(oilPrice.compareTo(discountPrice) == 0){
+                                    amt = receivableAmt;
+                                    discountAmt = new BigDecimal("0.00");
+                                }else {
+                                    amt = discountPrice.multiply(oilLiters);
+                                    discountAmt = receivableAmt.subtract(amt);
+                                }
+//                                amt = discountPrice.multiply(oilLiters);
+//                                discountAmt = receivableAmt.subtract(amt);
                                 //discountAmt = oilLiters.multiply(new BigDecimal(labelRuleDetailList.get(0).getDiscountLitersAmt()));
                                 discountAmt = discountAmt.setScale(2, BigDecimal.ROUND_HALF_UP);
                             }

YijiaRestful/src/main/resources/application.yml

@@ -19,7 +19,7 @@ yijia:
     domainName: mp.huijy.net
     # 路径前缀 test：测试； api：生产一线；prod：生产二线； demo：演示；
     path:
-        global-prefix: test
+        global-prefix: demo
 
 
 # POS机登录解密密文密码
@@ -44,7 +44,7 @@ swagger2:
 spring:
     datasource:
 #        url: jdbc:mysql://47.105.116.204:3306/jiaduoduo_db_prod?useUnicode=true&characterEncoding=utf8&nullCatalogMeansCurrent=true&serverTimezone=GMT%2b8&useSSL=true
-        url: jdbc:mysql://115.28.211.17:3306/jiaduoduo_db_test?useUnicode=true&characterEncoding=utf8&nullCatalogMeansCurrent=true&serverTimezone=GMT%2b8&useSSL=true
+        url: jdbc:mysql://115.28.211.17:3306/jiaduoduo_db_demo?useUnicode=true&characterEncoding=utf8&nullCatalogMeansCurrent=true&serverTimezone=GMT%2b8&useSSL=true
         username: develop
         password: 1234.Abcd
         driver-class-name: com.mysql.cj.jdbc.Driver