chore: 修改留位费支付相关接口

api/my.js

@@ -54,64 +54,46 @@ export function getApplicationStatus() {
 /**
  * 获取支付二维码
  */
-export function getOrder(params) {
-  return httpRequest.get(
-    `/api/enrollment/v1.0/application-materials/payment-records/request/${projectId}/APPLICATION_FEE`,
-    { params }
-  )
+export function getOrder(params, fee = 'APPLICATION_FEE') {
+  return httpRequest.get(`/api/enrollment/v1.0/application-materials/payment-records/request/${projectId}/${fee}`, { params })
 }
 
 /**
  * 检查支付状态
  */
-export function checkPay(id, params) {
-  return httpRequest.get(
-    `/api/enrollment/v1.0/application-materials/payment-records/check-status/${projectId}/APPLICATION_FEE/${id}`,
-    { params }
-  )
+export function checkPay(id, params, fee = 'APPLICATION_FEE') {
+  return httpRequest.get(`/api/enrollment/v1.0/application-materials/payment-records/check-status/${projectId}/${fee}/${id}`, { params })
 }
 
 /**
  * 写推荐信
  */
 export function addLetter(userId, letterId, data) {
-  return httpRequest.post(
-    `/api/enrollment/v1.0/application-materials/reco-letters/submit/${projectId}/${userId}/${letterId}/put`,
-    data,
-    {
-      headers: { 'Content-Type': 'application/json' }
-    }
-  )
+  return httpRequest.post(`/api/enrollment/v1.0/application-materials/reco-letters/submit/${projectId}/${userId}/${letterId}/put`, data, {
+    headers: { 'Content-Type': 'application/json' }
+  })
 }
 
 /**
  * 更换推荐人
  */
 export function updateProvider(letterId, data) {
-  return httpRequest.post(
-    `/api/enrollment/v1.0/application-materials/reco-letters/change-provider/${projectId}/${letterId}/put`,
-    data,
-    {
-      headers: { 'Content-Type': 'application/json' }
-    }
-  )
+  return httpRequest.post(`/api/enrollment/v1.0/application-materials/reco-letters/change-provider/${projectId}/${letterId}/put`, data, {
+    headers: { 'Content-Type': 'application/json' }
+  })
 }
 /**
  * 再次邀请
  */
 export function sendToProvider(letterId) {
-  return httpRequest.get(
-    `/api/enrollment/v1.0/application-materials/reco-letters/send-invitation-to-provider/${projectId}/${letterId}`
-  )
+  return httpRequest.get(`/api/enrollment/v1.0/application-materials/reco-letters/send-invitation-to-provider/${projectId}/${letterId}`)
 }
 
 /**
  * 发送推荐信
  */
 export function sendToProviders() {
-  return httpRequest.get(
-    `/api/enrollment/v1.0/application-materials/reco-letters/send-invitation-to-providers/${projectId}`
-  )
+  return httpRequest.get(`/api/enrollment/v1.0/application-materials/reco-letters/send-invitation-to-providers/${projectId}`)
 }
 /**
  * 退出登录
@@ -124,10 +106,7 @@ export function logout() {
  * 更改附件状态
  */
 export function changeFileStatus(userId, recordId, status) {
-  return httpRequest.get(
-    `/api/enrollment/v1.0/application-materials/attachments/change-status/${projectId}/${userId}/${recordId}`,
-    { params: { status } }
-  )
+  return httpRequest.get(`/api/enrollment/v1.0/application-materials/attachments/change-status/${projectId}/${userId}/${recordId}`, { params: { status } })
 }
 
 /**

modules/my/review/components/h5Pay.vue

@@ -20,7 +20,7 @@ export default {
   methods: {
     // 获取订单
     getOrder(callback) {
-      api.getOrder({ wx_open_id: this.openId, payment_method: 'WX_PAY' }).then(response => {
+      api.getOrder({ wx_open_id: this.openId, payment_method: 'WX_PAY' }, 'RESERVATION_FEE').then(response => {
         const { data, error, message } = response
         if (error.toString() === '0') {
           this.order = data
@@ -51,9 +51,7 @@ export default {
     // 去支付
     handlePay() {
       this.getOrder(() => {
-        window.location.href = `https://web-pay.ezijing.com/wxpay/h5?prepay_id=${this.order.wx_prepay_id}&open_id=${
-          this.openId
-        }&redirect_uri=${encodeURIComponent(this.pageUrl)}`
+        window.location.href = `https://web-pay.ezijing.com/wxpay/h5?prepay_id=${this.order.wx_prepay_id}&open_id=${this.openId}&redirect_uri=${encodeURIComponent(this.pageUrl)}`
       })
     }
   },

modules/my/review/components/qrcodePay.vue

@@ -44,7 +44,7 @@ export default {
   methods: {
     // 获取订单
     getOrder() {
-      api.getOrder({ payment_method: 'WX_PAY_QR' }).then(response => {
+      api.getOrder({ payment_method: 'WX_PAY_QR' }, 'RESERVATION_FEE').then(response => {
         const { data, error, message } = response
         this.qrcodeError = error.toString() === '1'
         if (error.toString() === '0') {

modules/my/review/pay.vue

@@ -45,7 +45,7 @@ export default {
     orderList() {
       // 筛选待支付订单
       const list = this.paymentRecords.filter(item => {
-        return item.bill_type === 'APPLICATION_FEE' && item.payment_status === 'WAITING_FOR_PAY'
+        return item.bill_type === 'RESERVATION_FEE' && item.payment_status === 'WAITING_FOR_PAY'
       })
       // 待支付订单是否有当前订单
       const found = list.find(item => item.id === this.order.id)
@@ -70,7 +70,7 @@ export default {
         if (paymentRecords && paymentRecords.length) {
           // 获取支付成功的订单
           const orderPaySuccess = paymentRecords.find(item => {
-            return item.bill_type === 'APPLICATION_FEE' && item.payment_status === 'SUCCESS'
+            return item.bill_type === 'RESERVATION_FEE' && item.payment_status === 'SUCCESS'
           })
           if (orderPaySuccess) {
             this.order = orderPaySuccess
@@ -89,7 +89,7 @@ export default {
         return
       }
       const userId = this.user.id
-      api.checkPay(order.id, { user_id: userId }).then(response => {
+      api.checkPay(order.id, { user_id: userId }, 'RESERVATION_FEE').then(response => {
         if (response.data.payment_status === 'SUCCESS') {
           this.timer && clearInterval(this.timer)
           this.dialogVisible = true