'commit'

ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Controller/YltController.java

@@ -83,7 +83,10 @@ public class YltController extends Controller {
         int mini_receivable_total_fee = thirdPartyStation.getInt("mini_receivable_total_fee");
         //最小充电度数
         int mini_charge_ah = thirdPartyStation.getInt("mini_charge_ah");
-
+        // 减免金额
+        int freeMoney = thirdPartyStation.getInt("freeMoney");//免费0元
+        // 减免时长
+        int freeTime = thirdPartyStation.getInt("freeTime");//2小时
         log.info("发现闸机提供商：" + name + ",parkId=" + parkId);
 
         //订单信息
@@ -109,10 +112,9 @@ public class YltController extends Controller {
         int totalMoney = (int) (ddRecord.getDouble("receivable_total_fee") * 100);
         //本地车场配置减免规则，根据充电时长换算
         int freeType = 1;
-        int freeMoney = 0;//免费0元
-        int freeTime = 2 * 60 * 60;//2小时
+
         //必须保证满足最低收费规则
-        if(totalMoney>=mini_receivable_total_fee && power>=mini_charge_ah){
+        if (totalMoney >= mini_receivable_total_fee && power >= mini_charge_ah) {
             // 科拓闸机
             if ("科拓".equals(name)) {
                 JSONObject jo = new JSONObject();