fix

mallinkService/src/main/java/com/iformall/service/park/impl/bolink/BoLinkParkService.java

@@ -103,8 +103,30 @@ public class BoLinkParkService extends BaseParkService implements ParkAdapterSer
                     extraMap.put("flag", "1");
             		
             		String freeMinute = dataObj.getString("free_out_time");
+            		
+            		StringBuffer msgsb = new StringBuffer();
+            		Double dem = dataObj.getDouble("derate_money");
+            		if (null != dem && dem.doubleValue() > 0 ) {
+            			msgsb.append("已减免").append(dem.doubleValue()).append("元,")
+            		}
+            		
+            		String ded = dataObj.getString("derate_duration");
+            		if (null == ded || StringUtils.isBlank(ded)) {
+            			ded = "0";
+            		}
+            		Double dedd = 0D;
+            		try {
+            			dedd = Double.parseDouble(ded);
+            		}catch(Exception e) {
+            			e.printStackTrace();
+            		}
+            		if (null != dedd && dedd.doubleValue() > 0 ) {
+            			msgsb.append("已减免").append(dem.doubleValue()).append("分钟,");
+            		}
+            		
+            		msgsb.append("请支付后").append(freeMinute).append("分钟内离场");
             		return new ParkStopFee(parkOrderId,inTime,bolinkUtil.addTimeByStr(inTime,duration),
-                    		String.valueOf(dataObj.getDouble("money")),appId,payPath,extraMap,null,"请支付后"+freeMinute+"分钟内离场");
+                    		String.valueOf(dataObj.getDouble("money")),appId,payPath,extraMap,null,msgsb.toString());
                 } else {
                 	logger.error("bolinkCarStopFee error. paramMap: {} . bolinkResult: {}",JSON.toJSONString(paramMap),ret);
              	    String msg = retObj.getString("errmsg");
@@ -147,7 +169,12 @@ public class BoLinkParkService extends BaseParkService implements ParkAdapterSer
         		if (null == ded || StringUtils.isBlank(ded)) {
         			ded = "0";
         		}
-        		Double dedd = Double.parseDouble(ded);
+        		Double dedd = 0D;
+        		try {
+        			dedd = Double.parseDouble(ded);
+        		}catch(Exception e) {
+        			e.printStackTrace();
+        		}
         		if (null != dedd && dedd.doubleValue() > 0 ) {
         			return new ResultData(ErrorCode.CYF_STOP_FEE_FAIL.getCode(), "已经做过时长抵扣("+dem.doubleValue()+"分钟),不能重复使用.");
         		}