From 34309994d56d63f93e419210eb6065065a6b64de Mon Sep 17 00:00:00 2001
From: liugongyu <290219706@qq.com>
Date: Mon, 10 Jul 2023 13:38:26 +0800
Subject: [PATCH] 补缴 聚合 支付

---
 src/components/orderPay.vue   |  40 ++++++++++++++++++++--------------------
 src/components/parkRecord.vue | 335 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/utils/utils.js            |   1 +
 3 files changed, 186 insertions(+), 190 deletions(-)

diff --git a/src/components/orderPay.vue b/src/components/orderPay.vue
index 9a7b113..a1beab5 100644
--- a/src/components/orderPay.vue
+++ b/src/components/orderPay.vue
@@ -77,28 +77,28 @@ 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.orderId = this.$route.query.ordeID
 
-    // console.log(this.orderId)
+    console.log(this.orderId)
 
     let me = this
     let _order = []
 
 
-    if (this.paySrcType == 103) {
-      this.orderId = JSON.parse(sessionStorage.getItem('pageIds'))
-      // this.orderId = JSON.parse(this.orderId)
-      console.log(this.orderId)
-      this.orderId.forEach(item => {
-        _order.push({
-          orderId: item
-        })
-      })
-      this.orderId = []
-      this.orderId = _order
-    }else{
-      this.orderId = sessionStorage.getItem('pageIds')
-    }
+    // if (this.paySrcType == 103) {
+    //   this.orderId = JSON.parse(sessionStorage.getItem('pageIds'))
+    //   // this.orderId = JSON.parse(this.orderId)
+    //   console.log(this.orderId)
+    //   this.orderId.forEach(item => {
+    //     _order.push({
+    //       orderId: item
+    //     })
+    //   })
+    //   this.orderId = []
+    //   this.orderId = _order
+    // }else{
+    //   this.orderId = sessionStorage.getItem('pageIds')
+    // }
     console.log(this.orderId)
     this.appOrderTimeout = this.$route.query.appOrderTimeout
     // if (this.clientBrowser == "微信") {
@@ -149,15 +149,15 @@ export default {
         orderActFee: me.arrearageActFee, // 应收
         orderBigType: '100',  // 订单大类型  100：停车订单     200：充值订单    300：会员卡订单
         orderTotalFee: me.arrearageActFee,  // 实收
-        payOrderType: 101, // 支付单来源 101：停车付款单 102：停车预付单 103：停车补缴单 104 共享车位 201 余额充值单 202 押金充值单 301 会员卡购买单 302 会员卡续费
+        payOrderType: this.paySrcType, // 支付单来源 101：停车付款单 102：停车预付单 103：停车补缴单 104 共享车位 201 余额充值单 202 押金充值单 301 会员卡购买单 302 会员卡续费
         paySource: '3',
         //支付单来源 101：停车付款单 102：停车预付单 103：停车补缴单 104 共享车位 201 余额充值单 202 押金充值单 301 会员卡购买单 302 会员卡续费
-        paySrcType: 101,
+        paySrcType: this.paySrcType,
         payType: this.$utils.clientBrowsePayType()==4?'36':'37',
-        rltOrderId: sessionStorage.getItem('pageIds'),
+        rltOrderId:  this.orderId,
         sourceType: '3',
         orgId: this.$utils.myOrgId,
-        terminalSource: '7',
+        terminalSource: this.$utils.commonTerminalSource,
       };
       jsondata.sign = this.$utils.signObject(jsondata)
 
diff --git a/src/components/parkRecord.vue b/src/components/parkRecord.vue
index d45c55d..3313bc0 100644
--- a/src/components/parkRecord.vue
+++ b/src/components/parkRecord.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="height: 100%">
-    <div  style="height: 100%">
+    <div style="height: 100%">
       <ul class="tabWrap">
         <li v-for="(i,index) in tabList"
             :key="i.id"
@@ -34,7 +34,8 @@
               <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,parkingData[0].parkDuration)" v-if="parkingData[0].parkDuration<=1800">申请离场</p>
+                <p class="out-btn" @click="toPayCurrent(i,parkingData[0].parkDuration)"
+                   v-if="parkingData[0].parkDuration<=1800">申请离场</p>
                 <p class="out-btn" @click="toPayCurrent(i,parkingData[0].parkDuration)" v-else>出场缴费</p>
               </div>
             </div>
@@ -114,26 +115,26 @@
 
 
     <!--<div v-else class="noRecord">-->
-      <!--暂无记录-->
+    <!--暂无记录-->
     <!--</div>-->
 
     <!--<modal-alert ref="alert">-->
-      <!--<div class="trave-tip-content txt-l" slot="content">-->
-        <!--<div class="confirm-text">-->
-          <!--<p>请至少选择一笔记录</p>-->
-        <!--</div>-->
-      <!--</div>-->
-      <!--<span slot="button">知道了</span>-->
+    <!--<div class="trave-tip-content txt-l" slot="content">-->
+    <!--<div class="confirm-text">-->
+    <!--<p>请至少选择一笔记录</p>-->
+    <!--</div>-->
+    <!--</div>-->
+    <!--<span slot="button">知道了</span>-->
     <!--</modal-alert>-->
 
 
     <!--<modal-alert ref="zeroAlert">-->
-      <!--<div class="trave-tip-content txt-l" slot="content">-->
-        <!--<div class="confirm-text">-->
-          <!--<p>停车15分钟内无需缴费，申请成功。</p>-->
-        <!--</div>-->
-      <!--</div>-->
-      <!--<span slot="button">知道了</span>-->
+    <!--<div class="trave-tip-content txt-l" slot="content">-->
+    <!--<div class="confirm-text">-->
+    <!--<p>停车15分钟内无需缴费，申请成功。</p>-->
+    <!--</div>-->
+    <!--</div>-->
+    <!--<span slot="button">知道了</span>-->
     <!--</modal-alert>-->
 
 
@@ -141,46 +142,51 @@
 </template>
 
 <script>
-import {parkRecordList, historyQuery, parkingQuery, appApplyParkOut, queryArrearageSta, doOrderCreate} from '@/api/parkRecord/parkRecord.js'
-import axios from 'axios'
-
+import {
+  parkRecordList,
+  historyQuery,
+  parkingQuery,
+  appApplyParkOut,
+  queryArrearageSta,
+  doOrderCreate
+} from "@/api/parkRecord/parkRecord.js";
+import axios from "axios";
 export default {
-  name: 'parkRecord',
+  name: "parkRecord",
   data() {
     return {
       tabList: [  // 切换数据
-        { text: '在停缴费', id: 1 },
-        { text: '欠费待缴', id: 2 },
+        { text: "在停缴费", id: 1 },
+        { text: "欠费待缴", id: 2 }
       ],
       carColor: 1,// 车牌颜色
       currentTabActive: 0, // 显示当前哪个
-      carNumber: '', //  车牌号码
+      carNumber: "", //  车牌号码
       parkingData: [], //  在停数据
       parkList: [], // 停车记录数据
       historyList: [  // 历史欠费数据
-        { money: 100, checked: false, id: 1 },
+        { money: 100, checked: false, id: 1 }
       ],
       allChecked: false, // 全部选择事件
       allMoney: 0, // 欠费所有的费用
       historyCheckedLen: 0, //选中了几笔交易
       historyCheckedMon: 0, //选中了待缴纳的金额
       orderIds: [] // 选中数据的订单 数组
-    }
+    };
   },
   mounted() {
-
   },
   created() {
     this.$Indicator.open({
-      text: '加载中...',
-      spinnerType: 'fading-circle'
-    })
-    this.carNumber = this.$route.query.carNumber  // 获取车牌号
-    this.carColor = this.$route.query.carNumberColor  // 获取颜色   0:蓝牌;1:黄牌;2:白牌;3:黑牌;4:绿色
-    this.currentTabActive = this.$route.query.parkFlag ? this.$route.query.parkFlag : 0
-    console.log(this.currentTabActive)
-    console.log(this.carNumber)
-    this.parkRecordList(10)
+      text: "加载中...",
+      spinnerType: "fading-circle"
+    });
+    this.carNumber = this.$route.query.carNumber;  // 获取车牌号
+    this.carColor = this.$route.query.carNumberColor;  // 获取颜色   0:蓝牌;1:黄牌;2:白牌;3:黑牌;4:绿色
+    this.currentTabActive = this.$route.query.parkFlag ? this.$route.query.parkFlag : 0;
+    console.log(this.currentTabActive);
+    console.log(this.carNumber);
+    this.parkRecordList(10);
   },
   methods: {
     parkRecordList(_parkState) {  // 获取停车记录数据
@@ -196,97 +202,83 @@ export default {
         terminalSource: 7,
         carNumber: this.carNumber,
         carNumberColor: this.carColor,
-        orgId:sessionStorage.getItem('orgId'),
-
-      }
-      jsondata.sign = this.$utils.signObject(jsondata)
-
+        orgId: sessionStorage.getItem("orgId")
+      };
+      jsondata.sign = this.$utils.signObject(jsondata);
       // jsondata.sign = md5sign
-      console.log('停车记录传参  ' + JSON.stringify(jsondata));
+      console.log("停车记录传参  " + JSON.stringify(jsondata));
       parkRecordList(jsondata).then(response => {
-        console.log(response)
-        this.parkList = response.data.dataList
-
+        console.log(response);
+        this.parkList = response.data.dataList;
         this.parkingData = this.parkList.filter(item => {
-          return item.parkState == '10'
-        })
+          return item.parkState == "10";
+        });
         // if (this.parkingData.length > 0) {
         //   this.currentTabActive = 0
         // }
-        console.log(this.parkingData)
+        console.log(this.parkingData);
         this.historyList = this.parkList.filter(item => {
-          return item.parkState == '20'
-        })
-
-
-        if(this.parkingData.length==0 && this.historyList.length>0){
-          this.currentTabActive = 1
+          return item.parkState == "20";
+        });
+        if (this.parkingData.length == 0 && this.historyList.length > 0) {
+          this.currentTabActive = 1;
         }
-
-        if(this.$route.query.parkFlag == 1){
-          this.currentTabActive = 1
-          this.checkedAll()
+        if (this.$route.query.parkFlag == 1) {
+          this.currentTabActive = 1;
+          this.checkedAll();
         }
-        console.log(this.historyList)
-
-        this.$Indicator.close()
-
-      })
+        console.log(this.historyList);
+        this.$Indicator.close();
+      });
     },
-
     tabHandle(index) { // tab 切换
-      this.currentTabActive = index
-      if(index==0){
+      this.currentTabActive = index;
+      if (index == 0) {
         // this.parkRecordList(10)
-
-      }else{
-        this.allMoney = 0
-        this.historyList.forEach( i => {
-          this.allMoney += Number(i.unPayFee)
-        })
+      } else {
+        this.allMoney = 0;
+        this.historyList.forEach(i => {
+          this.allMoney += Number(i.unPayFee);
+        });
         // this.allChecked = false
         // this.parkRecordList(10)
       }
     },
     chooseHandle(i, index) { // 历史欠费单个选择事件
-      i.checked = !i.checked
-      let me = this
+      i.checked = !i.checked;
+      let me = this;
       if (i.checked) { //单个选中
-        me.historyCheckedLen++
+        me.historyCheckedLen++;
         if (me.historyCheckedLen == this.historyList.length) {
-          this.allChecked = true
-
+          this.allChecked = true;
         }
-        me.orderIds.push(i.orderId)
-        me.historyCheckedMon += Number(i.unPayFee)
+        me.orderIds.push(i.orderId);
+        me.historyCheckedMon += Number(i.unPayFee);
       } else { //单个不选中
-        let _i = me.orderIds.indexOf(i.orderId)
-        me.orderIds.splice(_i, 1)
-        this.allChecked = false
-        me.historyCheckedLen--
-        me.historyCheckedMon -= Number(i.unPayFee)
+        let _i = me.orderIds.indexOf(i.orderId);
+        me.orderIds.splice(_i, 1);
+        this.allChecked = false;
+        me.historyCheckedLen--;
+        me.historyCheckedMon -= Number(i.unPayFee);
       }
-
     },
     checkedAll() { // 全选选择事件
-      this.allChecked = !this.allChecked
+      this.allChecked = !this.allChecked;
       if (this.allChecked) {  //全选
-        let me = this
-        this.historyList.forEach(function (item) {
+        let me = this;
+        this.historyList.forEach(function(item) {
           item.checked = true;
-          me.orderIds.push(item.orderId)
+          me.orderIds.push(item.orderId);
         });
-        this.historyCheckedMon = this.allMoney
-        this.historyCheckedLen = this.historyList.length
-
+        this.historyCheckedMon = this.allMoney;
+        this.historyCheckedLen = this.historyList.length;
       } else { //反选
-        this.historyList.forEach(function (item) {
+        this.historyList.forEach(function(item) {
           item.checked = false;
-
         });
-        this.historyCheckedLen = 0
-        this.historyCheckedMon = 0
-        this.orderIds = []
+        this.historyCheckedLen = 0;
+        this.historyCheckedMon = 0;
+        this.orderIds = [];
       }
     },
     toPayCurrent(i, num) { // 缴纳本次在停费用
@@ -297,14 +289,13 @@ export default {
         salt: salt,
         sign_type: "md5",
         orderId: i.orderId,
-        payOrderType: '101',
-        terminalSource: '3',
-      }
-      params.sign = this.$utils.signObject(params)
+        payOrderType: "101",
+        terminalSource: "3"
+      };
+      params.sign = this.$utils.signObject(params);
       appApplyParkOut(params).then(response => {
-        console.log(response)
-
-        if (response.code == '5005') {
+        console.log(response);
+        if (response.code == "5005") {
           var salt = this.$utils.myCommonSalt(32);
           var jsondata = {
             app_id: this.$utils.myVarAppid,
@@ -314,21 +305,21 @@ export default {
             payType: this.$utils.clientBrowsePayType(),
             appId: this.$utils.myVxAppId,
             orderId: i.orderId,
-            terminalSource: '7',
+            terminalSource: "7",
             parkCode: i.parkCode,
-            carNumber: this.carNumber,
-          }
-          jsondata.sign = this.$utils.signObject(jsondata)
+            carNumber: this.carNumber
+          };
+          jsondata.sign = this.$utils.signObject(jsondata);
           parkingQuery(jsondata).then(result => {
-            console.log(result)
-            let res = result.data
-            let _dis = res.discountFee
-            let discountFee = _dis.slice(1, _dis.length - 1)
-            console.log(i.orderId)
-            sessionStorage.setItem('pageIds',i.orderId)
+            console.log(result);
+            let res = result.data;
+            let _dis = res.discountFee;
+            let discountFee = _dis.slice(1, _dis.length - 1);
+            console.log(i.orderId);
+            // sessionStorage.setItem("pageIds", i.orderId);
             this.$router.push(
               {
-                path: 'orderPay',
+                path: "orderPay",
                 query: {
                   carColor: this.carColor,// 车牌颜色
                   arrearageTotalFee: res.orderTotalFee,// 应收
@@ -336,32 +327,26 @@ export default {
                   arrearageActFee: res.orderFee,// 实收
                   carNumber: this.carNumber, // 车牌
                   paySrcType: 101, //支付的类型   101 是本次   103是历史欠费
-                  // ordeID: i.orderId, //支付的订单号
-                  appOrderTimeout: res.appOrderTimeout, // 超时描述
+                  ordeID: i.orderId, //支付的订单号
+                  appOrderTimeout: res.appOrderTimeout // 超时描述
                 }
               }
-            )
-          })
-
+            );
+          });
         } else {
           //$('.dialog-out').show()
-          this.$msgbox('提示', '停车15分钟内无需缴费，申请成功。')
+          this.$msgbox("提示", "停车15分钟内无需缴费，申请成功。");
         }
-
-      })
-
+      });
     },
     toPayHisroryPage() { // 缴纳历史费用
       if (this.historyCheckedLen == 0) {
-        this.$msgbox('提示', '请至少选择一条记录')
-
-        return
+        this.$msgbox("提示", "请至少选择一条记录");
+        return;
       }
       var salt = this.$utils.myCommonSalt(32);
-
-      var list = "[" + this.orderIds + "]"
-      console.log(this.orderIds)
-
+      var list = "[" + this.orderIds + "]";
+      console.log(this.orderIds);
       var jsondata = {
         app_id: this.$utils.myVarAppid,
         deviceInfo: this.$utils.myDeviceInfo,
@@ -369,65 +354,75 @@ export default {
         sign_type: "md5",
         payType: this.$utils.clientBrowsePayType(),
         // appId: this.$utils.myVxAppId,
-        terminalSource: '7',
+        terminalSource: "7",
         orderIds: JSON.stringify(this.orderIds)
-      }
-      jsondata.sign = this.$utils.signObject(jsondata)
-      console.log(jsondata)
+      };
+      jsondata.sign = this.$utils.signObject(jsondata);
+      console.log(jsondata);
       queryArrearageSta(jsondata).then(response => {
-        console.log(response)
-
-        this.doOrderCreate()
-
+        console.log(response.data);
+        let res = response.data
+        this.doOrderCreate(res.arrearageTotalFee,res.arrearageActFee,res.carArrearages[0].arrearageDiscFee);
         // 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(){
+    doOrderCreate(arrearageTotalFee,arrearageActFee,arrearageDiscFee) {
       var salt = this.$utils.myCommonSalt(32);
-
-      var list = "[" + this.orderIds + "]"
-      console.log(this.orderIds)
-
+      // var list = "[" + this.orderIds + "]"
+      console.log(this.orderIds);
+      let carNumbers = [];
+      carNumbers.push(this.carNumber);
       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)
+        orderBigType: 100,
+        payOrderType: 103,
+        terminalSource: this.$utils.commonTerminalSource,
+        parkOrderIds: this.orderIds,
+        operCode: "",
+        operName: "",
+        backDeveloperCode: "",
+        backPlNo: "",
+        orgId: this.$utils.myOrgId,
+        orderTotalFee: arrearageTotalFee,
+        orderActFee: arrearageActFee,
+        token: "",
+        backType: 2,
+        carNumberList: carNumbers,
+        payType: "12"
+      };
+      jsondata.sign = this.$utils.signObject(jsondata);
+      console.log(jsondata);
       doOrderCreate(jsondata).then(response => {
-
-      })
+        let res = response.data
+        this.$router.push(
+          {
+            path: "orderPay",
+            query: {
+              carColor: this.carColor,// 车牌颜色
+              arrearageTotalFee: arrearageTotalFee,// 应收
+              arrearageDiscFee: arrearageDiscFee,// 优惠
+              arrearageActFee: arrearageActFee,// 实收
+              carNumber: this.carNumber, // 车牌
+              paySrcType: 103, //支付的类型   101 是本次   103是历史欠费
+              ordeID: res.rltOrderId, //支付的订单号
+              appOrderTimeout: "",
+              // backDeveloperCode: response.data.inChargerCode
+              backDeveloperCode: ''
+            }
+          }
+        );
+      });
     }
   },
   filters: {}
-}
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 1008ca1..87556aa 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -168,6 +168,7 @@ export default {
   myOrgId: sessionStorage.getItem('orgId'), // 归属地 赤峰id  10003    黄石 10079
 
   myOrgId: '10120', // 归属地 赤峰id  10003    黄石 10079
+  commonTerminalSource:7,
 
   myGetSign: function (objb) { // 获取签名
     var compare = function (obj1, obj2) {
--
libgit2 0.21.4