From 6d13a0037e5b779794eb342f2a1b4a8c45a20981 Mon Sep 17 00:00:00 2001
From: liugongyu <290219706@qq.com>
Date: Tue, 11 Jul 2023 09:20:43 +0800
Subject: [PATCH] 会员卡聚合支付

---
 src/api/card/card.js           |  5 +++--
 src/utils/utils.js             |  4 +++-
 src/views/cards/buyVipCard.vue | 48 +++++++++++++++++++++++++++++++++++++++++-------
 src/views/cards/cardList.vue   |  8 ++++----
 src/views/cards/ownCards.vue   | 30 ++----------------------------
 5 files changed, 53 insertions(+), 42 deletions(-)

diff --git a/src/api/card/card.js b/src/api/card/card.js
index 74ae8e1..0505225 100644
--- a/src/api/card/card.js
+++ b/src/api/card/card.js
@@ -35,9 +35,9 @@ export function queryUserCars(params) { //车辆信息查询
 }
 
 
-export function createVipCardOrder2022(params) { //会员卡购买续费2022
+export function createVipCardOrder(params) { //会员卡购买续费
   return request({
-    url: 'vip/createVipCardOrder2022',
+    url: 'vip/createVipCardOrder',
     method: 'post',
     data: params
   })
@@ -51,3 +51,4 @@ export function queryVipCardsByCustId(params) { //查询用户已购买的会员
   })
 }
 
+
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 98ef1a2..f2c1b7c 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -129,7 +129,9 @@ export default {
     jsonObj.app_id = "lrpo55tmveqe07w3gpovzgx34pdez7eh";
     jsonObj.deviceInfo = "BC0703A4-AFB0-4B51-9089-9B7487C0CC6E";
     jsonObj.salt = myCommonSalt(32);
-    jsonObj.token = localStorage.getItem('userToken');
+    // jsonObj.token = localStorage.getItem('userToken');
+    jsonObj.token = 'e3b5417a987641219efb8dc1f8b5fbce'  // 为了测试
+
     let sort = [];
     for (let k in jsonObj) {
       sort.push({
diff --git a/src/views/cards/buyVipCard.vue b/src/views/cards/buyVipCard.vue
index 87a6805..7d2b55e 100644
--- a/src/views/cards/buyVipCard.vue
+++ b/src/views/cards/buyVipCard.vue
@@ -90,7 +90,8 @@
 </template>
 
 <script>
-import { queryUserCars, createVipCardOrder2022 } from "@/api/card/card";
+import { queryUserCars, createVipCardOrder } from "@/api/card/card";
+import { doPay } from '@/api/doPay'
 export default {
   name: "buyVipCard",
   data() {
@@ -116,7 +117,8 @@ export default {
       actPrice: "",//单价
       discValue: "",//优惠
       payPrice: "", // 支付金额
-      xufeiFlag: ""//判断是否续费  1否    2是
+      xufeiFlag: "",//判断是否续费  1否    2是
+      custCardNo:'', // 卡编号
     };
   },
   created() {
@@ -167,6 +169,7 @@ export default {
     console.log(this.payPrice);
     if (this.xufeiFlag == 2) { // 2代表续费
       this.valueStart = this.$route.query.expDate;
+      this.custCardNo = this.$route.query.custCardNo;
       // effDate
       this.getEffDate(1);
     } else {
@@ -280,6 +283,7 @@ export default {
       // paySrcType 301 会员卡购买单 302 会员卡续费
       // cardCouponsId	是	string	已购买的会员卡id 新增不传 续费必传
       // optType	是	string	操作类型 1 购买 2 续费
+      console.log(this.xufeiFlag )
       if (this.carNum == "点击选择车牌") {
         this.$toast("请先选择车牌");
         return;
@@ -295,22 +299,52 @@ export default {
         effDate: this.valueStart,
         expDate: this.effDate,
         carNumber: this.carNum,
-        optType: this.xufeiFlag == 1 ? "1" : "2",
-        cardCouponsId: this.$router.query.custCardNo,
+        optType: this.xufeiFlag == 2 ? "2" : "1",
+        cardCouponsId: this.custCardNo,
         forceBuy: "1"
       };
       jsondata.sign = this.$utils.signObject(jsondata);
-      createVipCardOrder2022(jsondata).then(response => {
+      createVipCardOrder(jsondata).then(response => {
         console.log(response);
         if (response.code == 0) {
-          let orderId = response.data.orderId;
-          console.log(orderId);
+          let rltOrderId = response.data.orderId;
+          let orderFeeMon = response.data.orderFee
+          this.cardDoPay(rltOrderId,orderFeeMon)
+          console.log(rltOrderId);
         } else if (response.code == 5006) {
           this.$toast("请先去补缴欠费订单");
         } else {
           this.$toast(response.message);
         }
       });
+    },
+    cardDoPay(rltOrderId,orderFee){
+      console.log(orderFee)
+      let jsondata = {
+        orderBigType:300,
+        payOrderType:301,
+        openId: '',
+        appId: this.$utils.xuanhuaAppid,
+        carNumber: this.carNum,
+        rltOrderId: rltOrderId,
+        payType: '4',
+        paySource: '3',
+        //支付单来源 101：停车付款单 102：停车预付单 103：停车补缴单 104 共享车位 201 余额充值单 202 押金充值单 301 会员卡购买单 302 会员卡续费
+        paySrcType:this.xufeiFlag == 2 ? "302" : "301", // 1购买   2续费
+        sourceType: '3',
+        //个人使用的卡券cardId
+        // couponPersonId: me.selCoupon.custCardId,
+        terminalSource: this.$utils.commonTerminalSource, //小程序
+        orderTotalFee:  this.actPrice*this.count,  // 应收
+        orderActFee: orderFee , // 实收
+        // terminalOS: common.terminalOS,
+        orgId: this.$utils.myOrgId,
+      };
+      jsondata.sign = this.$utils.signObject(jsondata);
+      doPay(jsondata).then(response => {
+        console.log(response.data.payinfo)
+        window.location.href = response.data.payinfo
+      })
     }
   }
 };
diff --git a/src/views/cards/cardList.vue b/src/views/cards/cardList.vue
index 4e13af4..23ece98 100644
--- a/src/views/cards/cardList.vue
+++ b/src/views/cards/cardList.vue
@@ -79,11 +79,11 @@ export default {
     queryVipCardListByOrgId() {
       let jsondata = {
         orgId: this.$utils.orgId,
-        longitude: "115.10114",
-        latitude: "40.616892",
+        latitude: "115.10114",
+        longitude: "40.616892",
         type: "00",
-        limit: "10000000",
-        saleChannel: "2"
+        limit: "1000",
+        saleChannel: "2"  // 办理渠道, 1：APP 4：微信小程序
       };
       jsondata.sign = this.$utils.signObject(jsondata);
       queryVipCardListByOrgId(jsondata).then(response => {
diff --git a/src/views/cards/ownCards.vue b/src/views/cards/ownCards.vue
index a9b6181..3a1929e 100644
--- a/src/views/cards/ownCards.vue
+++ b/src/views/cards/ownCards.vue
@@ -27,33 +27,7 @@ export default {
   name: "ownCards",
   data() {
     return {
-      mycardlist: [{
-        "cardName": "测试1",
-        "parkName": "东济路",
-        "num": 1,
-        "discount": "1.0",
-        "invoiceState": "0",
-        "useType": "1",
-        "cardNo": "V1123900924620210176",
-        "expDate": "2023-07-28",
-        "effDate": "2023-06-29",
-        "carType": "2",
-        "payType": "12",
-        "price": "100",
-        "isSupportRenew": "1",
-        "cardStatus": "2",
-        "parkNo": "P15040000000018",
-        "payFinishTime": "2023-06-29 09:01:37",
-        "cardType": "4",
-        "orderPayedFee": "10",
-        "custCardNo": "7011123901072930799616",
-        "carNumber": "苏B13ERR",
-        "parkAddr": "江阴市江阴高新技术产业开发区东济路",
-        "totalAmount": "100",
-        "saleChannel": "4",
-        "custCardId": "4493",
-        "actPrice": "100"
-      }]
+      mycardlist: []
     };
   },
   created() {
@@ -67,7 +41,7 @@ export default {
       jsondata.sign = this.$utils.signObject(jsondata);
       queryVipCardsByCustId(jsondata).then(response => {
         console.log(response);
-        // this.mycardlist = response.data
+        this.mycardlist = response.data
       });
     },
     gotoNextPay(i) {
--
libgit2 0.21.4