Browse Source

未登录下单接口异常修复

john.hong 2 năm trước cách đây
mục cha
commit
fec9d80898

+ 15 - 0
src/api/mockData/checkout.qh5.response.json

@@ -0,0 +1,15 @@
+{
+  "parkingRecord": {
+    "vehicleNo": "粤BDF1412", 
+    "enterTime": "2023-01-06 19:24:50", 
+    "serviceMin": 84, 
+    "totalFee": 1, 
+    "totalFeeInYuan": 0.01
+  }, 
+  "parkInfo": {
+    "parkName": "VLhpfQGTMDYpsBZxvfBoeygjb", 
+    "description": "深圳停车费用说明", 
+    "parkMallCode": 5, 
+    "buildingId": "QHKC-P1"
+  }
+}

+ 1 - 1
src/pages/parkingFee/components/base/parkingFeeDetail.vue

@@ -108,7 +108,7 @@
     </div>
     <div class="flewx">
       <div class="flewx-content">
-        应付<span style="color: #ff0000; font-size: 32px; padding-left: 20px">{{ actualPayFee | currency }}</span>
+        应付<span style="color: #ff0000; font-size: 32px; padding-left: 20px">{{ actualPayFee }}</span>
         <span style="color: #8d8d8d; padding-left: 30px; font-size: 28px">已优惠{{ usingTotalDiscount | currency }}元</span>
         <div class="count-down-box">

+ 2 - 1
src/pages/parkingFee/mixins/parkingFeeDetail.js

@@ -118,7 +118,7 @@ export default {
             enterTime: parkingRecord.enterTime,
             serviceMin: parkingRecord.serviceMin,
             totalFee: parkingRecord.totalFee, //应缴
-            actualPayFee: parkingRecord.actualPayFee, //应付金额
+            actualPayFee: this.actualPayFee, //应付金额
           },
           discountInfo: {
             usingTotalDiscount: discountInfo?.usingTotalDiscount || 0, //优惠金额"
@@ -145,6 +145,7 @@ export default {
             params.discountInfo.coupons = selectedCoupons
           }
         }
+        console.log('下单时的参数', params);
         const res = await ordersAndPrepay(params);
         // console.log('orderDetail', res);
         if (res?.paymentType === 'NO_FEE_PAY') {

+ 25 - 21
src/store/order.js

@@ -2,8 +2,8 @@ import { checkOut, calculateDiscount, ordersAndPrepay, currentUnlicensedPlate, u
 
 // import checkOutQHResponse from '@/api/mockData/checkout.qh3.response.json'
 // import checkOutQHResponse from '@/api/mockData/checkout.hz.response.json';
-// import checkOutQHResponse from '@/api/mockData/checkout.qh4.response.json'
-import unlicensedCarCheckInResponse from '@/api/mockData/unlicensedCarCheckIn.qh.response.json';
+// import checkOutQHResponse from '@/api/mockData/checkout.qh5  .response.json'
+// import unlicensedCarCheckInResponse from '@/api/mockData/unlicensedCarCheckIn.qh.response.json';
 
 // 大于等于停车费
 // 微服务接口字段
@@ -148,7 +148,7 @@ const actions = {
       // const res = await checkOut('闽AAQ5519', unlicensed);
       // const res = await checkOut('粤A51113');
       // const res = await checkOut('沪DCJ986');
-      console.log('无牌车扫码出场', endlessLoop);
+      // console.log('无牌车扫码出场', endlessLoop);
       // 场内缴费,调 check-out 接口,
       const method = unlicensed && endlessLoop ? unlicensedCarCheckout : checkOut
       const res = await method(vehicleNo, false, gateId);
@@ -170,30 +170,34 @@ const actions = {
     // 记录buildingId
     window.localStorage.setItem('buildingId', checkOutResponse.parkInfo.buildingId);
     commit('setOrderDetail', checkOutResponse);
+    const isShowDiscounts = checkOutResponse?.parkingRule?.enableCoupon || false;
     // 是否展示优惠
-    commit('setIsShowDiscounts', checkOutResponse?.parkingRule?.enableCoupon || false);
-    // 会员等级减免
-    // 停车优惠(首停、会员减免、消费减免)
-    dispatch('getCheckedTotal', checkOutResponse);
-    // 是否开启新会员积分(hold)
-    commit('setEnableNewMemberPoints', checkOutResponse.parkingRule.enableNewMemberPoints);
-    // 积分减免
-    dispatch('pointsRule', checkOutResponse);
-    // dispatch('getIntegralDesc', checkOutResponse.parkingRule.enablePoints);
-    // 电子优惠券:是否启用
-    // 处理电子优惠券相关逻辑
-    dispatch('couponRule', checkOutResponse);
-    // 纸质优惠券(hold)
-    commit('setEnablePaperCoupons', checkOutResponse.parkingRule.enablePaperCoupons);
-    // 其他数据收集
-    commit('setUsingTotalDiscount', checkOutResponse.discountInfo.usingTotalDiscount);
-    commit('setActualPayFee', checkOutResponse.parkingRecord.actualPayFee);
+    commit('setIsShowDiscounts', isShowDiscounts);
+    if(isShowDiscounts) {
+      // 会员等级减免
+      // 停车优惠(首停、会员减免、消费减免)
+      dispatch('getCheckedTotal', checkOutResponse);
+      // 是否开启新会员积分(hold)
+      commit('setEnableNewMemberPoints', checkOutResponse.parkingRule.enableNewMemberPoints);
+      // 积分减免
+      dispatch('pointsRule', checkOutResponse);
+      // dispatch('getIntegralDesc', checkOutResponse.parkingRule.enablePoints);
+      // 电子优惠券:是否启用
+      // 处理电子优惠券相关逻辑
+      dispatch('couponRule', checkOutResponse);
+      // 纸质优惠券(hold)
+      commit('setEnablePaperCoupons', checkOutResponse?.parkingRule?.enablePaperCoupons || []);
+      // 其他数据收集
+      commit('setUsingTotalDiscount', checkOutResponse?.discountInfo?.usingTotalDiscount || 0);
+    }
+    console.log('190190190190', checkOutResponse);
+    commit('setActualPayFee', checkOutResponse.parkingRecord?.actualPayFee || checkOutResponse.parkingRecord?.totalFeeInYuan || 0.00);
   },
   // 停车优惠(首停、会员减免、消费减免)
   getCheckedTotal({ commit, dispatch }, orderDetail) {
     let checkedTotal = 0;
     console.log(orderDetail);
-    if (orderDetail?.discountInfo.memberLevelDiscount && orderDetail?.discountInfo?.memberGrade.length) {
+    if (orderDetail?.discountInfo?.memberLevelDiscount && orderDetail?.discountInfo?.memberGrade.length) {
       orderDetail.discountInfo.memberGrade.forEach((elm) => {
         if (elm.defaultSelected) {
           checkedTotal++;

+ 2 - 2
vue.config.js

@@ -115,11 +115,11 @@ module.exports = {
       },
       '/msApi': {
         // target: 'http://172.20.50.208:8080',
-        target: 'https://dev-kip-service-internal.kerryonvip.com/temporary-parking-service', //代理地址,这里设置的地址会代替axios中设置的baseURL
+        // target: 'https://dev-kip-service-internal.kerryonvip.com/temporary-parking-service', //代理地址,这里设置的地址会代替axios中设置的baseURL
         // target: 'http://172.21.203.140:8080', //代理地址,这里设置的地址会代替axios中设置的baseURL   2023-2-9
         // target: 'http://172.21.203.20:8080', //代理地址,这里设置的地址会代替axios中设置的baseURL
         // target: 'http://172.21.200.89:8080', //代理地址,这里设置的地址会代替axios中设置的baseURL
-        // target: 'http://172.20.50.208:8080', // 代理地址,这里设置的地址会代替axios中设置的baseURL
+        target: 'http://172.21.201.227:8080', // 代理地址,这里设置的地址会代替axios中设置的baseURL
         changeOrigin: true, // 如果接口跨域,需要进行这个参数配置
         //ws: true, // proxy websockets
         //pathRewrite方法重写url