From e5b4babd7282c52e8c0584d1829e580088753248 Mon Sep 17 00:00:00 2001
From: wangfs <15029758498@163.com>
Date: Wed, 5 Jul 2017 23:53:13 +0800
Subject: [PATCH] 提交

---
 src/main/java/com/rnt/service/IRainQueryService.java | 21 +++++++++++++++++++++
 src/main/resources/a_little_config.txt               |  4 +++-
 src/main/webapp/WEB-INF/pages/check.html             | 11 ++++-------
 src/main/webapp/WEB-INF/pages/pay.html               |  5 +----
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/rnt/service/IRainQueryService.java b/src/main/java/com/rnt/service/IRainQueryService.java
index 45e6c24..93c5f48 100644
--- a/src/main/java/com/rnt/service/IRainQueryService.java
+++ b/src/main/java/com/rnt/service/IRainQueryService.java
@@ -73,4 +73,25 @@ public class IRainQueryService {
 	
 		return JSONObject.toJSON(rs)+"";
 	}
+	
+	public static void main(String[] args) {
+		Prop prop = PropKit.use("a_little_config.txt");
+		String rs  = "";
+	    Long time = System.currentTimeMillis();
+		String md5  = MD5Utils.enMD5(prop.get("irain.appid")+prop.get("irain.appsecret")+time);
+		Map<String, Object> params = new HashMap<>();
+		params.put("appid", prop.get("irain.appid"));
+		params.put("sign", md5);
+		params.put("timestamp", time);
+		params.put("vpl_number", "苏B1B566");
+		params.put("park_code", "734861a1e8656ffa51bdd90829941ca9");
+		
+		try {
+			logger.info("irain 查询停车费用入参:" + JSONObject.toJSONString(params));
+			 rs = HttpClientTutorial.httpPostRequest(prop.get("irain.url")+"/bill/Query", params);
+			logger.info("irain 查询停车费用返回:" + JSONObject.toJSONString(rs));
+		} catch (Exception e) {
+			logger.info("irain 查询停车费用出错:" + e);
+	}
+	}
 }
diff --git a/src/main/resources/a_little_config.txt b/src/main/resources/a_little_config.txt
index 2e9d9aa..3d92a11 100644
--- a/src/main/resources/a_little_config.txt
+++ b/src/main/resources/a_little_config.txt
@@ -25,6 +25,8 @@ zf.druid.url=jdbc:mysql://10.117.185.28:3306/zt_order?useUnicode=true&characterE
 zf.druid.username=order
 zf.druid.password=MySQL5.7;123
 
+
+
 zf.druid.initialSize=1
 zf.druid.minIdle=1
 zf.druid.maxActive=20
@@ -40,7 +42,7 @@ zf.druid.testOnWhileIdle=true
 #Redis config
 redis.host=127.0.0.1
 redis.port=6379
-#redis.password=redis_63790
+redis.password=myredis
 
 
 # 微信服务器回调所用的 token
diff --git a/src/main/webapp/WEB-INF/pages/check.html b/src/main/webapp/WEB-INF/pages/check.html
index c14c76b..ce26ea4 100644
--- a/src/main/webapp/WEB-INF/pages/check.html
+++ b/src/main/webapp/WEB-INF/pages/check.html
@@ -70,7 +70,6 @@
 <div class="weui-cells weui-cells_form">
     <input type="hidden" id="carNumPre" value="${carNum!''}"/>
     <input type="hidden" id="parkOrderId"/>
-    <input type="hidden" id="payOrderId">
     <div class="weui-cell">
         <div class="weui-cell__hd"><label for="" class="weui-label">当前车牌</label></div>
         <div class="weui-cell__bd" id="carNumber">
@@ -177,7 +176,6 @@
             flg = false;
             $('#showTooltips').attr('class', 'weui-btn weui-btn_primary weui-btn_disabled');
             var parkOrderId = $('#parkOrderId').val();
-            var payOrderId = $('#payOrderId').val();
             if (parkOrderId.length < 1) {
                 $.toptip("订单Id为空", 2000, "error");
                 $('#showTooltips').attr('class', 'weui-btn weui-btn_primary');
@@ -185,8 +183,7 @@
                 return false;
             }
             var req = {
-                orderId: parkOrderId,
-                payOrderId:payOrderId
+                orderId: parkOrderId
             }
 
             $.ajax({
@@ -212,12 +209,12 @@
     function jsApiCall(payParam) {
         WeixinJSBridge.invoke(
             'getBrandWCPayRequest',
-            payParam,
+            JSON.parse(payParam),
             function (res) {
                 if (res.err_msg == "get_brand_wcpay_request:ok") {
-                    $.alert("亲!支付成功!");
+                    //$.alert("亲!支付成功!");
                     //支付成功
-                    windows.location.href = mUrl.paySuccessView + '&payMoney=' + totleMoney;
+                    window.location.href = mUrl.paySuccessView + '&payMoney=' + totleMoney;
 
                 } else {
                     //支付失败
diff --git a/src/main/webapp/WEB-INF/pages/pay.html b/src/main/webapp/WEB-INF/pages/pay.html
index c6c82d5..28440c8 100644
--- a/src/main/webapp/WEB-INF/pages/pay.html
+++ b/src/main/webapp/WEB-INF/pages/pay.html
@@ -51,7 +51,6 @@
 
 <body ontouchstart>
 <input type="hidden" id="parkOrderId" value="${parkOrderId!''}"/>
-<input type="hidden" id="payOrderId" value="${payOrderId!''}"/>
 <div class="weui-panel__bd card-top">
   <input type="hidden" id="orderId" value=""/>
   <div class="weui-media-box weui-media-box_text weui-media-box-border card-park">
@@ -182,7 +181,6 @@
       flg = false;
       $('#showTooltips').attr('class', 'weui-btn weui-btn_primary weui-btn_disabled');
       var parkOrderId = $('#parkOrderId').val();
-      var payOrderId = $('#payOrderId').val();
       if (parkOrderId.length < 1) {
         $.toptip("亲!订单Id为空", 2000, "error");
         $('#showTooltips').attr('class', 'weui-btn weui-btn_primary');
@@ -190,8 +188,7 @@
         return false;
       }
       var req = {
-        orderId: parkOrderId,
-        payOrderId:payOrderId
+        orderId: parkOrderId
       }
 
       $.ajax({
--
libgit2 0.21.4