在停聚合支付

刘淇
1 parent a17ce3df
Showing 7 changed files with 267 additions and 148 deletions
src/api/orderPay/orderPay.js
src/api/parkRecord/parkRecord.js
src/components/orderPay.vue
src/components/parkRecord.vue
src/components/plateNumber.vue
src/utils/request.js
src/utils/utils.js
@@ -45,6 +45,13 @@ export function queryParkingRecordPageByCarNumbers(params) {  // 支付完成后
  
  
  
+export function doPay(params) {  // 支付信息获取
+  return request({
+    url: 'allInPay/doPay',
+    method: 'post',
+    data: params
+  })
+}
  
  
  
@@ -33,8 +33,19 @@ export function appApplyParkOut(params) {  // 0元出场
   })
 }
  
+export function queryArrearageSta(params) {  // 查询补缴订单详情
+  return request({
+    url: 'queryParkOrder/queryArrearageSta',
+    method: 'post',
+    data: params
+  })
+}
  
-
-
-
+export function doOrderCreate(params) {  // 查询补缴订单详情
+  return request({
+    url: 'allInPay/doOrderCreate',
+    method: 'post',
+    data: params
+  })
+}
  
@@ -47,7 +47,7 @@
 // import CryptoJS from '../utils/AES.js'
 // let Base64 = require('js-base64').Base64
 import {  MessageBox } from 'mint-ui';
-import { aliPay, getOpenId, vxPayQuery, bankH5Pay, queryParkingRecordPageByCarNumbers } from '@/api/orderPay/orderPay'
+import { aliPay, getOpenId, vxPayQuery, bankH5Pay, queryParkingRecordPageByCarNumbers, doPay } from '@/api/orderPay/orderPay'
  
 export default {
   name: 'orderPay',
@@ -101,11 +101,11 @@ export default {
     }
     console.log(this.orderId)
     this.appOrderTimeout = this.$route.query.appOrderTimeout
-    if (this.clientBrowser == "微信") {
-      this.webAppCode = this.getCode();
-    }
-
+    // if (this.clientBrowser == "微信") {
+    //   this.webAppCode = this.getCode();
+    // }
  
+   console.log(this.$utils.clientBrowsePayType())
  
   },
   mounted(){
@@ -137,72 +137,101 @@ export default {
         this.backDeveloperCode = this.$route.query.backDeveloperCode
       }
  
-      if (this.clientBrowser == '支付宝') { // 支付宝支付
-        let me = this
-        var aliParams = {};
-        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 = sessionStorage.getItem('orgId')
-        aliParams.backType = 2
-        aliParams.backDeveloperCode = this.backDeveloperCode
-        aliParams.recordArreaInfos = this.orderId;
-        console.log(aliParams)
-        aliPay(aliParams).then(response => {
-          console.log(response)
-          if (response.code == 0) {//进场
-            document.write(response.data);//打开支付表单
-          } else if(response.code == 1002){//其他情况如【该卡号场内已存在】
-            console.log(response.message);
-            MessageBox.confirm('', {
-              message: response.message,
-              title: '温馨提示',
-              showCancelButton:false,
-              confirmButtonText: '确定',
-            }).then(action => {
-              if (action == 'confirm') {     //确认的回调
-                console.log('确定');
-                this.$router.go(-1)
-              }
-            }).catch(err => {
-              if (err == 'cancel') {     //取消的回调
-                console.log('取消');
-              }
-            });
-          }else{
-            alert(response.message)
-          }
-
-        })
-      }
-
  
+      var salt = this.$utils.myCommonSalt(32);
+
+      var list = "[" + this.orderIds + "]"
+      console.log(this.orderIds)
+
+      var jsondata = {
+        appId:this.$utils.xuanhuaAppid,
+        carNumber: me.carNumber,
+        orderActFee: me.arrearageActFee, // 应收
+        orderBigType: '100',  // 订单大类型  100：停车订单     200：充值订单    300：会员卡订单
+        orderTotalFee: me.arrearageActFee,  // 实收
+        payOrderType: 101, // 支付单来源 101：停车付款单 102：停车预付单 103：停车补缴单 104 共享车位 201 余额充值单 202 押金充值单 301 会员卡购买单 302 会员卡续费
+        paySource: '3',
+        //支付单来源 101：停车付款单 102：停车预付单 103：停车补缴单 104 共享车位 201 余额充值单 202 押金充值单 301 会员卡购买单 302 会员卡续费
+        paySrcType: 101,
+        payType: this.$utils.clientBrowsePayType()==4?'36':'37',
+        rltOrderId: sessionStorage.getItem('pageIds'),
+        sourceType: '3',
+        orgId: this.$utils.myOrgId,
+        terminalSource: '7',
+      };
+      jsondata.sign = this.$utils.signObject(jsondata)
+
+      doPay(jsondata).then(response => {
+        console.log(response.data.payinfo)
+        window.location.href = response.data.payinfo
+      })
  
-      if (this.clientBrowser == '微信') { // 微信支付
-        let _openId = sessionStorage.getItem('openIdDataNew')
-        if(_openId){
-          me.vxPay(_openId,this.orderId)
-        }else {
-          //第一步获取openid
-          var codeParams = {
-            code: this.webAppCode,
-            appId: this.$utils.myVxAppId
-          };
-          getOpenId(codeParams).then(res => {
-            if (res.code == 0) {
-              me.vxPay(res.data, this.orderId)
-              sessionStorage.setItem('openIdDataNew', res.data)
-            } else if (res.code == 40163) { //code been used, hints[重复code问题]
-              alert('请重新扫码重复code问题')
-              console.log(res.message);
-            } else {
-              alert('请重新扫码')
-            }
-          })
-        }
-      }
+      // if (this.clientBrowser == '支付宝') { // 支付宝支付
+      //   let me = this
+      //   var aliParams = {};
+      //   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 = sessionStorage.getItem('orgId')
+      //   aliParams.backType = 2
+      //   aliParams.backDeveloperCode = this.backDeveloperCode
+      //   aliParams.recordArreaInfos = this.orderId;
+      //   console.log(aliParams)
+      //   aliPay(aliParams).then(response => {
+      //     console.log(response)
+      //     if (response.code == 0) {//进场
+      //       document.write(response.data);//打开支付表单
+      //     } else if(response.code == 1002){//其他情况如【该卡号场内已存在】
+      //       console.log(response.message);
+      //       MessageBox.confirm('', {
+      //         message: response.message,
+      //         title: '温馨提示',
+      //         showCancelButton:false,
+      //         confirmButtonText: '确定',
+      //       }).then(action => {
+      //         if (action == 'confirm') {     //确认的回调
+      //           console.log('确定');
+      //           this.$router.go(-1)
+      //         }
+      //       }).catch(err => {
+      //         if (err == 'cancel') {     //取消的回调
+      //           console.log('取消');
+      //         }
+      //       });
+      //     }else{
+      //       alert(response.message)
+      //     }
+      //
+      //   })
+      // }
+      //
+      //
+      //
+      // if (this.clientBrowser == '微信') { // 微信支付
+      //   let _openId = sessionStorage.getItem('openIdDataNew')
+      //   if(_openId){
+      //     me.vxPay(_openId,this.orderId)
+      //   }else {
+      //     //第一步获取openid
+      //     var codeParams = {
+      //       code: this.webAppCode,
+      //       appId: this.$utils.myVxAppId
+      //     };
+      //     getOpenId(codeParams).then(res => {
+      //       if (res.code == 0) {
+      //         me.vxPay(res.data, this.orderId)
+      //         sessionStorage.setItem('openIdDataNew', res.data)
+      //       } else if (res.code == 40163) { //code been used, hints[重复code问题]
+      //         alert('请重新扫码重复code问题')
+      //         console.log(res.message);
+      //       } else {
+      //         alert('请重新扫码')
+      //       }
+      //     })
+      //   }
+      // }
  
     },
     vxPay(openIdData, orderIdData) {
@@ -141,7 +141,7 @@
 </template>
  
 <script>
-import {parkRecordList, historyQuery, parkingQuery, appApplyParkOut} from '@/api/parkRecord/parkRecord.js'
+import {parkRecordList, historyQuery, parkingQuery, appApplyParkOut, queryArrearageSta, doOrderCreate} from '@/api/parkRecord/parkRecord.js'
 import axios from 'axios'
  
 export default {
@@ -217,9 +217,7 @@ export default {
         this.historyList = this.parkList.filter(item => {
           return item.parkState == '20'
         })
-        this.historyList.forEach( i => {
-          this.allMoney += Number(i.unPayFee)
-        })
+
  
         if(this.parkingData.length==0 && this.historyList.length>0){
           this.currentTabActive = 1
@@ -239,10 +237,15 @@ export default {
     tabHandle(index) { // tab 切换
       this.currentTabActive = index
       if(index==0){
-        this.parkRecordList(10)
+        // this.parkRecordList(10)
+
       }else{
         this.allMoney = 0
-        this.parkRecordList(30)
+        this.historyList.forEach( i => {
+          this.allMoney += Number(i.unPayFee)
+        })
+        // this.allChecked = false
+        // this.parkRecordList(10)
       }
     },
     chooseHandle(i, index) { // 历史欠费单个选择事件
@@ -357,46 +360,69 @@ export default {
       var salt = this.$utils.myCommonSalt(32);
  
       var list = "[" + this.orderIds + "]"
+      console.log(this.orderIds)
  
       var jsondata = {
         app_id: this.$utils.myVarAppid,
         deviceInfo: this.$utils.myDeviceInfo,
         salt: salt,
-        // sign: md5sign,
         sign_type: "md5",
-        appId: this.$utils.myVxAppId,
-        orderIds: list,
-        terminalSource: '7',
         payType: this.$utils.clientBrowsePayType(),
-        orgId: sessionStorage.getItem('orgId'),
-        backDeveloperCode: this.$route.query.backDeveloperCode
+        // appId: this.$utils.myVxAppId,
+        terminalSource: '7',
+        orderIds: JSON.stringify(this.orderIds)
       }
       jsondata.sign = this.$utils.signObject(jsondata)
       console.log(jsondata)
-      historyQuery(jsondata).then(response => {
+      queryArrearageSta(jsondata).then(response => {
         console.log(response)
-        let res = response.data.carArrearages[0]
-        console.log(res)
-
-        this.orderIds = JSON.stringify(this.orderIds)
-        sessionStorage.setItem('pageIds',this.orderIds)
-        console.log(this.orderIds)
-        this.$router.push(
-          {
-            path: 'orderPay',
-            query: {
-              carColor: this.carColor,// 车牌颜色
-              arrearageTotalFee: res.arrearageTotalFee,// 应收
-              arrearageDiscFee: res.arrearageDiscFee,// 优惠
-              arrearageActFee: res.arrearageActFee,// 实收
-              carNumber: this.carNumber, // 车牌
-              paySrcType: 103, //支付的类型   101 是本次   103是历史欠费
-              // ordeID: this.orderIds, //支付的订单号
-              appOrderTimeout: '',
-              backDeveloperCode: response.data.inChargerCode
-            }
-          }
-        )
+
+        this.doOrderCreate()
+
+        // let res = response.data.carArrearages[0]
+        // console.log(res)
+
+        // this.orderIds = JSON.stringify(this.orderIds)
+        // sessionStorage.setItem('pageIds',this.orderIds)
+        // console.log(this.orderIds)
+        // this.$router.push(
+        //   {
+        //     path: 'orderPay',
+        //     query: {
+        //       carColor: this.carColor,// 车牌颜色
+        //       arrearageTotalFee: res.arrearageTotalFee,// 应收
+        //       arrearageDiscFee: res.arrearageDiscFee,// 优惠
+        //       arrearageActFee: res.arrearageActFee,// 实收
+        //       carNumber: this.carNumber, // 车牌
+        //       paySrcType: 103, //支付的类型   101 是本次   103是历史欠费
+        //       // ordeID: this.orderIds, //支付的订单号
+        //       appOrderTimeout: '',
+        //       backDeveloperCode: response.data.inChargerCode
+        //     }
+        //   }
+        // )
+      })
+    },
+    doOrderCreate(){
+      var salt = this.$utils.myCommonSalt(32);
+
+      var list = "[" + this.orderIds + "]"
+      console.log(this.orderIds)
+
+      var jsondata = {
+        app_id: this.$utils.myVarAppid,
+        deviceInfo: this.$utils.myDeviceInfo,
+        salt: salt,
+        sign_type: "md5",
+        payType: this.$utils.clientBrowsePayType(),
+        // appId: this.$utils.myVxAppId,
+        terminalSource: '7',
+        orderIds: JSON.stringify(this.orderIds)
+      }
+      jsondata.sign = this.$utils.signObject(jsondata)
+      console.log(jsondata)
+      doOrderCreate(jsondata).then(response => {
+
       })
     }
   },
@@ -28,30 +28,30 @@
       </div>
  
  
-      <div class="radio-box">
-        <label class="flex-items-center">
-          <img v-if="formData.commonCard == 1"
-               src="../assets/images/icon_chose_s@2x.png"
-               alt="">
-          <img v-else
-               src="../assets/images/icon_chose_n@2x.png"
-               alt="">
-          <input type="radio"
-                 v-model="formData.commonCard"
-                 value="1" />普通车牌
-        </label>
-        <label class="flex-items-center">
-          <img v-if="formData.commonCard == 2"
-               src="../assets/images/icon_chose_s@2x.png"
-               alt="">
-          <img v-else
-               src="../assets/images/icon_chose_n@2x.png"
-               alt="">
-          <input type="radio"
-                 v-model="formData.commonCard"
-                 value="2" />新能源车牌
-        </label>
-      </div>
+      <!--<div class="radio-box">-->
+        <!--<label class="flex-items-center">-->
+          <!--<img v-if="formData.commonCard == 1"-->
+               <!--src="../assets/images/icon_chose_s@2x.png"-->
+               <!--alt="">-->
+          <!--<img v-else-->
+               <!--src="../assets/images/icon_chose_n@2x.png"-->
+               <!--alt="">-->
+          <!--<input type="radio"-->
+                 <!--v-model="formData.commonCard"-->
+                 <!--value="1" />普通车牌-->
+        <!--</label>-->
+        <!--<label class="flex-items-center">-->
+          <!--<img v-if="formData.commonCard == 2"-->
+               <!--src="../assets/images/icon_chose_s@2x.png"-->
+               <!--alt="">-->
+          <!--<img v-else-->
+               <!--src="../assets/images/icon_chose_n@2x.png"-->
+               <!--alt="">-->
+          <!--<input type="radio"-->
+                 <!--v-model="formData.commonCard"-->
+                 <!--value="2" />新能源车牌-->
+        <!--</label>-->
+      <!--</div>-->
  
  
       <div class="submit-box" @click="submitFn()">
@@ -327,17 +327,17 @@ export default {
     }
   },
   mounted () {
-
-    if (this.$utils.clientBrowser() == "微信") {
-      var appID = this.$utils.myVxAppId;
-      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,0#wechat_redirect'
-      } else {
-        return code;
-      }
-    }
+    //
+    // if (this.$utils.clientBrowser() == "微信") {
+    //   var appID = this.$utils.myVxAppId;
+    //   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,0#wechat_redirect'
+    //   } else {
+    //     return code;
+    //   }
+    // }
  
   },
   methods: {
@@ -349,6 +349,14 @@ export default {
     },
     chooseColor (index){ // 颜色选择
       this.currentColor = index
+      // formData.commonCard
+
+      if(this.currentColor==4){
+        this.formData.commonCard=2
+      }else{
+        this.formData.commonCard=1
+      }
+
       switch (this.currentColor) {
         case 0 :
           return this.activeBG = '#0054C0'
@@ -419,7 +427,7 @@ export default {
     },
     submitFn () {
       let plateLicense
-      if (this.formData.commonCard === '1') {
+      if (this.formData.commonCard == '1') {
         plateLicense = this.plate_license_1
         plateLicense = this.palindrome(plateLicense)
         if (plateLicense.length < 7) {
@@ -427,7 +435,7 @@ export default {
           return
         }
       }
-      if (this.formData.commonCard === '2') {
+      if (this.formData.commonCard == '2') {
         plateLicense = this.plate_license_2
         plateLicense = this.palindrome(plateLicense)
         if (plateLicense.length < 8) {
@@ -13,7 +13,7 @@ const service = axios.create({
  
   //  https://dev.renniting.cn/pay/  赤峰农行测试环境
  
-  baseURL: 'https://pay.ccccitd.cc', // url = base url + request url
+  baseURL: 'http://wxzhifu.natapp1.cc', // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
   timeout: 10000 // request timeout
 })
@@ -74,6 +74,40 @@ export default {
     return this.myGetSign(sort)
   },
  
+  signObjectNew: function (inputData){ //签名字段
+    // let sort = []
+    // for(let k in jsonObj){
+    //   sort.push({
+    //     keyname: k,
+    //     value: jsonObj[k]
+    //   })
+    // }
+    // return this.myGetSign(sort)
+
+
+    var jsonList = inputData;
+    jsonList.sign_type = "md5";
+    jsonList.app_id = "lrpo55tmveqe07w3gpovzgx34pdez7eh";
+    jsonList.deviceInfo = "BC0703A4-AFB0-4B51-9089-9B7487C0CC6E";
+    jsonList.salt = this.myCommonSalt(32);
+    jsonList.terminalSource= '7'
+    // jsonList.token= "e3b5417a987641219efb8dc1f8b5fbce"
+    // jsonList.token = '84b5a8edb5974f7989e7888b9f48a765';
+    var arrData = [];
+    for (var key in jsonList) {
+      var obj = {};
+      // console.log("key = "+key);
+      // // obj[key] =jsonList[key];
+      obj.keyname = key;
+      obj.value = jsonList[key];
+      // console.log(obj);
+      arrData.push(obj);
+    }
+    var sign = this.myGetSign(arrData);
+    jsonList.sign = sign;
+    return jsonList;
+  },
+
   clientBrowser: function () { // 判断客户端
     if (/MicroMessenger/.test(window.navigator.userAgent)) {
       console.log("微信客户端");
@@ -119,7 +153,7 @@ export default {
   // ud8yq5tv0inxupc05xfeau39jywlqoj2  新的id
   // ny1u72b6k374sg379z0kqjgfxe2ycnpw 新的签名
  
-  myVarAppid:'ud8yq5tv0inxupc05xfeau39jywlqoj2',// 公共请求Appid
+  myVarAppid:'lrpo55tmveqe07w3gpovzgx34pdez7eh',// 公共请求Appid
  
   myDeviceInfo: 'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E', // 公共请求设备信息
  
@@ -129,8 +163,12 @@ export default {
   // 黄石 appid    wxa1a66cc7d263afe6
   // 天水 appid    wx776e81ec7494232e
  
+  xuanhuaAppid:'00276515',
+
   myOrgId: sessionStorage.getItem('orgId'), // 归属地 赤峰id  10003    黄石 10079
  
+  myOrgId: '10120', // 归属地 赤峰id  10003    黄石 10079
+
   myGetSign: function (objb) { // 获取签名
     var compare = function (obj1, obj2) {
       var val1 = obj1.keyname;
@@ -144,13 +182,13 @@ export default {
       }
     }
     objb.sort(compare);
-    var strmd5 = 'ny1u72b6k374sg379z0kqjgfxe2ycnpw';
+    var strmd5 = 'gz8wfwd0gn1etamjjhzey1ggcz78pfvd';
     for(var i=0;i<objb.length;i++){
       if(objb[i].value != null&&objb[i].value != ''){
         strmd5 += objb[i].keyname+objb[i].value;
       }
     }
-    strmd5 += 'ny1u72b6k374sg379z0kqjgfxe2ycnpw';
+    strmd5 += 'gz8wfwd0gn1etamjjhzey1ggcz78pfvd';
     // console.log('strmd5-------->'+strmd5);
     strmd5 = md5(strmd5);
     strmd5=strmd5.toUpperCase();