From 9269cefa118435c86fa33fb398dd55c3913b1f6b Mon Sep 17 00:00:00 2001
From: liuqimichale <123456lq>
Date: Thu, 21 Jan 2021 17:48:19 +0800
Subject: [PATCH] 黄石分支 --  支付

---
 src/api/orderPay/orderPay.js    |  23 +++++++++++++++++++++++
 src/assets/images/carBlack.png  | Bin 1658 -> 0 bytes
 src/assets/images/carYellow.png | Bin 1887 -> 0 bytes
 src/components/orderPay.vue     | 214 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------
 src/components/parkRecord.vue   |   6 +++---
 src/utils/utils.js              |   5 ++++-
 6 files changed, 150 insertions(+), 98 deletions(-)

diff --git a/src/api/orderPay/orderPay.js b/src/api/orderPay/orderPay.js
index 37ceebd..dc2a28e 100644
--- a/src/api/orderPay/orderPay.js
+++ b/src/api/orderPay/orderPay.js
@@ -17,6 +17,7 @@ export function getOpenId(params) {  // 获取OpenId
   })
 }
 
+
 export function vxPayQuery(params) {  // 微信
   return request({
     url: 'weixinpay/publicUnifiedOrder',
@@ -25,5 +26,27 @@ export function vxPayQuery(params) {  // 微信
   })
 }
 
+// 新接口银联
+
+export function doPay(params) {  // 微信
+  return request({
+    url: 'unionpay/doPay',
+    method: 'post',
+    data: params
+  })
+}
+
+
+// 创建订单
+
+export function doOrderCreate(params) {  // 创建订单
+  return request({
+    url: 'unionpay/doOrderCreate',
+    method: 'post',
+    data: params
+  })
+}
+
+
 
 
diff --git a/src/assets/images/carBlack.png b/src/assets/images/carBlack.png
index 3603de8..2698b70 100644
Binary files a/src/assets/images/carBlack.png and b/src/assets/images/carBlack.png differ
diff --git a/src/assets/images/carYellow.png b/src/assets/images/carYellow.png
index c57914f..561a94f 100644
Binary files a/src/assets/images/carYellow.png and b/src/assets/images/carYellow.png differ
diff --git a/src/components/orderPay.vue b/src/components/orderPay.vue
index 0a79582..372ee93 100644
--- a/src/components/orderPay.vue
+++ b/src/components/orderPay.vue
@@ -40,7 +40,7 @@
 </template>
 
 <script>
-import {aliPay, getOpenId, vxPayQuery} from '@/api/orderPay/orderPay'
+import {aliPay, getOpenId, vxPayQuery, doPay, doOrderCreate} from '@/api/orderPay/orderPay'
 
 export default {
   name: 'orderPay',
@@ -56,6 +56,7 @@ export default {
       orderId: '',  //支付的订单
       webAppCode: '', // 微信code
       appOrderTimeout: '', // 超时描述
+      isAndroid: '', // 终端类型
     }
   },
   created() {
@@ -66,8 +67,13 @@ export default {
     this.arrearageActFee = this.$route.query.arrearageActFee // 实收
     this.clientBrowser = this.$utils.clientBrowser() //支付方式
     this.paySrcType = this.$route.query.paySrcType // 实收
-    this.orderId = this.$route.query.ordeID
-    this.appOrderTimeout = this.$route.query.appOrderTimeout
+    this.orderId = this.$route.query.ordeID // 订单号
+    console.log(this.orderId)
+    this.appOrderTimeout = this.$route.query.appOrderTimeout  //提示
+
+    let userAgent = navigator.userAgent;
+    this.isAndroid = userAgent.indexOf('Android') > -1 || userAgent.indexOf('Adr') > -1; //android终端
+
     if (this.clientBrowser == "微信") {
       this.webAppCode = this.getCode();
     }
@@ -75,7 +81,7 @@ export default {
   methods: {
     getCode() {
       var appID = this.$utils.myVxAppId;
-      var code = this.$route.query.code
+      var code = this.getUrlParam('code');
       var local = window.location.href;
       if (code == null || code === '') {
         window.location.href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=' + appID + '&redirect_uri=' + encodeURIComponent(local) + '&response_type=code&scope=snsapi_userinfo&state=1#wechat_redirect'
@@ -83,38 +89,53 @@ export default {
         return code;
       }
     },
-    toPay() {
-      let me = this
-      let _order = []
-      this.orderId = JSON.parse(this.orderId)
-      console.log(this.orderId)
-      if (this.paySrcType == 103) {
-        this.orderId.forEach(item => {
-          _order.push({
-            orderId: item
-          })
-        })
-        this.orderId = []
-        this.orderId = _order
-      }
+    doOrderCreate(orderID) { // 欠费创建订单号
+      var jsondata = {
+        orderBigType: 100,
+        payOrderType: this.paySrcType,
+        parkOrderIds: orderID,
+        terminalSource: 7,
+        operName: '',
+        operCode: '',
+      };
+      // jsondata = JSON.stringify(jsondata);
+      doOrderCreate(jsondata).then(res => {
+        console.log(res)
+        this.orderId = res.data.rltOrderId
+        console.log(this.orderId)
+        this.dopay(this.orderId)
+      })
 
+    },
+    getUrlParam(name) {
+      var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)');
+      var r = window.location.search.substr(1).match(reg)
+      if (r != null) return unescape(r[2])
+      return null
+    },
+    dopay(orderID) {
+      let me = this
       if (this.clientBrowser == '支付宝') { // 支付宝支付
-        var aliParams = {};
-        console.log(this.orderId)
-        console.log(typeof this.orderId)
-        aliParams.orderId = this.orderId;
-        aliParams.carNumber = this.carNumber;
-        aliParams.payType = 1;// 1:支付宝 2：微信 3：银联 10:H5   4微信公众号
-        aliParams.terminalSource = 7;//请求端来源 1： 任你停 2：pda 3：微信公共号 7:H5扫码 10页面支付
-        aliParams.paySrcType = this.paySrcType;//101停车支付
-        aliParams.orgId = this.$utils.myOrgId,
-        aliParams.backType = 2,
-        aliParams.recordArreaInfos = JSON.stringify(this.orderId);
-
-        aliPay(aliParams).then(response => {
+        var jsondata = {
+          orderBigType: 100,
+          payOrderType: this.paySrcType,
+          rltOrderId: orderID,
+          payType: 1, // 1 是支付宝    2是微信
+          terminalSource: 7,
+          orderActFee: this.arrearageActFee,
+          orderTotalFee: this.arrearageTotalFee,
+          orderDicountFee: this.arrearageDiscFee,
+          payUserId: '',
+          terminalOS: this.isAndroid ? 'AND' : 'IOS',
+          couponType: 1, //优惠类型
+          couponCode: this.arrearageDiscFee,
+        };
+
+        doPay(jsondata).then(response => {
           console.log(response)
           if (response.code == 0) {//进场
-            document.write(response.data);//打开支付表单
+            window.location.href = response.data.h5PayRequest
+            // document.write(response.data);//打开支付表单
           } else {//其他情况如【该卡号场内已存在】
             console.log(response.message);
           }
@@ -130,57 +151,82 @@ export default {
         };
         getOpenId(codeParams).then(res => {
           if (res.code == 0) {
-            me.vxPay(res.data, this.orderId)
+            // me.vxPay(res.data, this.orderId)
+
+            var jsondata = {
+              orderBigType: 100,
+              payOrderType: this.paySrcType,
+              rltOrderId: orderID,
+              payType: 2, // 1 是支付宝    2是微信
+              terminalSource: 7,
+              orderActFee: this.arrearageActFee,
+              orderTotalFee: this.arrearageTotalFee,
+              orderDicountFee: this.arrearageDiscFee,
+              payUserId: res.data,
+              terminalOS: this.isAndroid ? 'AND' : 'IOS',
+              couponType: 1, //优惠类型
+              couponCode: this.arrearageDiscFee,
+            };
+
+            doPay(jsondata).then(response => {
+              console.log(response)
+              if (res.code == 0) { //
+                //alertMsg("出场成功");
+                if (res.data) {
+                  var data = res.data;
+                  console.log(JSON.stringify(data));
+                  if (typeof WeixinJSBridge === 'undefined') { // 微信浏览器内置对象。参考微信官方文档
+                    if (document.addEventListener) {
+                      document.addEventListener('WeixinJSBridgeReady', vm.onBridgeReady(data), false)
+                    } else if (document.attachEvent) {
+                      document.attachEvent('WeixinJSBridgeReady', vm.onBridgeReady(data))
+                      document.attachEvent('onWeixinJSBridgeReady', vm.onBridgeReady(data))
+                    }
+                  } else {
+                    console.log('准备调用微信支付')
+                    vm.onBridgeReady(data)
+                  }
+                } else {
+                  alert("没有找到返回值");
+                }
+              } else {
+                alert('支付错误')
+                console.log(res.message);
+                alert(res.message);
+              }
+
+            })
+
           } else if (res.code == 40163) { //code been used, hints[重复code问题]
+            alert('获取opendid错误--------')
             alert(res.message)
             console.log(res.message);
           } else {
+            alert('获取opendid错误')
             alert(res.message)
           }
         })
 
       }
-
     },
-    vxPay(openIdData, orderIdData) {
-      var wxParams = {};
-      wxParams.orderId = orderIdData;
-      wxParams.backType = 2,
-      wxParams.orgId = this.$utils.myOrgId,
-      wxParams.payType = 4;// 1:支付宝 2：微信 3：银联 10:H5   4微信公众号
-      wxParams.terminalSource = 7;//请求端来源 1： 任你停 2：pda 3：微信公共号 7:H5扫码 10页面支付
-      wxParams.carNumber = this.carNumber;
-      wxParams.paySrcType = this.paySrcType;//101停车支付
-      wxParams.recordArreaInfos = JSON.stringify(orderIdData);
-      wxParams.openId = openIdData;
-      wxParams.appId = this.$utils.myVxAppId;
-      vxPayQuery(wxParams).then( res => {
-        if (res.code == 0) { //
-          //alertMsg("出场成功");
-          if (res.data) {
-            var data = res.data;
-            console.log(JSON.stringify(data));
-            if (typeof WeixinJSBridge === 'undefined') { // 微信浏览器内置对象。参考微信官方文档
-              if (document.addEventListener) {
-                document.addEventListener('WeixinJSBridgeReady', vm.onBridgeReady(data), false)
-              } else if (document.attachEvent) {
-                document.attachEvent('WeixinJSBridgeReady', vm.onBridgeReady(data))
-                document.attachEvent('onWeixinJSBridgeReady', vm.onBridgeReady(data))
-              }
-            } else {
-              console.log('准备调用微信支付')
-              vm.onBridgeReady(data)
-            }
-          } else {
-            alert("没有找到返回值");
-          }
-        } else {
-          console.log(res.message);
-          alert(res.message);
-        }
-      })
+    toPay() {
+      let me = this
+      let _order = []
+      // this.orderId = JSON.parse(this.orderId)
+      console.log(this.orderId)
+      if (this.paySrcType == 103) {
+        this.orderId = JSON.parse(this.orderId)
+        this.doOrderCreate(this.orderId)
+      } else {
+        console.log(this.orderId)
+        console.log(typeof this.orderId)
+
+        this.dopay(this.orderId)
+      }
+
     },
-    onBridgeReady (data) {
+
+    onBridgeReady(data) {
       console.log('调用微信支付WeixinJSBridge')
       var vm = this
       WeixinJSBridge.invoke(
@@ -197,7 +243,7 @@ export default {
         function (res) {
           // 使用以上方式判断前端返回,微信团队郑重提示：res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
           if (res.err_msg === 'get_brand_wcpay_request:ok') {
-           console.log('成功')
+            console.log('成功')
           } else {
             console.log('失败')
             alert('支付失败')
@@ -206,27 +252,7 @@ export default {
       )
     },
   },
-  filters: {
-    // formateColor(val) {  // 0:蓝牌;1:黄牌;2:白牌;3:黑牌;4:绿色
-    //   switch (val) {
-    //     case 0:
-    //       return 'carBlue'
-    //       break;
-    //     case 1:
-    //       return 'carYellow'
-    //       break;
-    //     case 2:
-    //       return 'carWhite'
-    //       break;
-    //     case 3:
-    //       return ' carBlack'
-    //       break;
-    //     case 4:
-    //       return 'carGreen'
-    //       break;
-    //   }
-    // }
-  }
+
 }
 </script>
 
diff --git a/src/components/parkRecord.vue b/src/components/parkRecord.vue
index e8d77e5..0f0b422 100644
--- a/src/components/parkRecord.vue
+++ b/src/components/parkRecord.vue
@@ -15,7 +15,7 @@
       <div v-show="currentTabActive==0">
 
         <div v-if="parkingData.length>0">
-          <p class="free-tip" v-if="parkingData[0].parkDuration<=1800">停车30分钟内无需缴费，请直接离场。</p>
+          <p class="free-tip" v-if="parkingData[0].parkDuration<=2100">停车30分钟内无需缴费，请直接离场。</p>
 
           <div class="cost-main" v-for="i in parkingData">
             <ul class="cost-header">
@@ -34,7 +34,7 @@
               <p>停车时长：{{ $utils.dateFormat(i.parkDuration)}}</p>
               <div class="out-wrap">
                 <p class="mon-wrap">￥{{(i.unPayFee/100).toFixed(2)}}</p>
-                <p class="out-btn" @click="toPayCurrent(i)" v-if="parkingData[0].parkDuration>1800">出场缴费</p>
+                <p class="out-btn" @click="toPayCurrent(i)" v-if="parkingData[0].parkDuration>2100">出场缴费</p>
               </div>
             </div>
           </div>
@@ -133,7 +133,7 @@ export default {
     return {
       tabList: [  // 切换数据
         { text: '在停缴费', id: 1 },
-        { text: '离场待缴', id: 2 },
+        { text: '欠费待缴', id: 2 },
       ],
       carColor: 1,// 车牌颜色
       currentTabActive: 1, // 显示当前哪个
diff --git a/src/utils/utils.js b/src/utils/utils.js
index c75f17a..08abba3 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -95,7 +95,10 @@ export default {
 
   myDeviceInfo: 'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E', // 公共请求设备信息
 
-  myVxAppId: 'wxa1a66cc7d263afe6' , // 微信赤峰 appid   wx2af2bab90d433c86      //黄石 appid    wxa1a66cc7d263afe6
+  myVxAppId: 'wxa1a66cc7d263afe6',
+  // 测试环境 微信赤峰 appid   wxff4cebaedbf4f886
+  // 微信赤峰 appid   wx2af2bab90d433c86
+  // 黄石 appid    wxa1a66cc7d263afe6
 
   myOrgId: '10079', // 归属地 赤峰id  10003    黄石 10079
 
--
libgit2 0.21.4