Sfoglia il codice sorgente

fix(KIP-10709): 【DE】【C端】【沈阳】。电子券选择存在问题,未按照用户当前可用抵扣时长进行限制

john 2 anni fa
parent
commit
0d49ebf331

+ 212 - 0
src/api/mockData/checkout.sy2.response.json

@@ -0,0 +1,212 @@
+{
+  "parkingRecord": {
+      "vehicleNo": "鲁A10005",
+      "enterTime": "2023-06-13 11:53:01",
+      "serviceMin": 3235,
+      "totalFee": 16000,
+      "actualPayFee": 120,
+      "thirdPartyId": "_1_71a6cc7e_1686822537681",
+      "thirdParkOrderNo": "71a6cc7e526e4cff91aa4f62ab2743f7",
+      "createdByQrCode": false,
+      "totalFeeInYuan": 160
+  },
+  "discountInfo": {
+      "usingTotalDiscount": 40,
+      "memberLevelDiscount": true,
+      "memberGrade": [
+          {
+              "defaultSelected": true,
+              "selected": true,
+              "memberGrade": "1",
+              "memberGradeText": "芳华卡",
+              "discountTime": 1,
+              "discountFee": 5
+          }
+      ],
+      "consume": [
+          {
+              "defaultSelected": true,
+              "selected": true,
+              "maxDiscountTime": 4,
+              "defaultDiscountTime": 4,
+              "discountFee": 20,
+              "redeemSalesAmount": 800
+          }
+      ],
+      "points": [
+          {
+              "available": 445,
+              "selected": true,
+              "pointsPerUnit": 500,
+              "unitAmount": 5,
+              "totalAvailable": 445,
+              "unitHour": 1,
+              "newMember": false,
+              "label": "445积分可减免",
+              "discountFee": 0
+          }
+      ],
+      "coupons": [
+          {
+              "code": "ee087ceo9cy_t",
+              "couponId": "dfc9fab9a9ce4cbfb44c15274f6f1e79",
+              "selected": true,
+              "status": "available",
+              "name": "停车券(可叠加)",
+              "expirationDate": "2023-06-16 23:59:59",
+              "discountFee": 5,
+              "defaultSelected": true,
+              "superposition": "2",
+              "limitCountPerOrder": 10
+          },
+          {
+              "code": "k2huazxj3q0_t",
+              "couponId": "dfc9fab9a9ce4cbfb44c15274f6f1e79",
+              "selected": true,
+              "status": "available",
+              "name": "停车券(可叠加)",
+              "expirationDate": "2023-06-16 23:59:59",
+              "discountFee": 5,
+              "defaultSelected": true,
+              "superposition": "2",
+              "limitCountPerOrder": 10
+          },
+          {
+              "code": "l70n2cfpvi9_t",
+              "couponId": "dfc9fab9a9ce4cbfb44c15274f6f1e79",
+              "selected": true,
+              "status": "available",
+              "name": "停车券(可叠加)",
+              "expirationDate": "2023-06-16 23:59:59",
+              "discountFee": 5,
+              "defaultSelected": false,
+              "superposition": "2",
+              "limitCountPerOrder": 10
+          },
+          {
+              "code": "8pauidxqi7p_t",
+              "couponId": "dfc9fab9a9ce4cbfb44c15274f6f1e79",
+              "selected": false,
+              "status": "available",
+              "name": "停车券(可叠加)",
+              "expirationDate": "2023-06-16 23:59:59",
+              "discountFee": 5,
+              "defaultSelected": false,
+              "superposition": "2",
+              "limitCountPerOrder": 10
+          },
+          {
+              "code": "xsci7f90m4b_t",
+              "couponId": "dfc9fab9a9ce4cbfb44c15274f6f1e79",
+              "selected": false,
+              "status": "available",
+              "name": "停车券(可叠加)",
+              "expirationDate": "2023-06-16 23:59:59",
+              "discountFee": 5,
+              "defaultSelected": false,
+              "superposition": "2",
+              "limitCountPerOrder": 10
+          },
+          {
+              "code": "gys040hr5lz_t",
+              "couponId": "dfc9fab9a9ce4cbfb44c15274f6f1e79",
+              "selected": false,
+              "status": "available",
+              "name": "停车券(可叠加)",
+              "expirationDate": "2023-06-16 23:59:59",
+              "discountFee": 5,
+              "defaultSelected": false,
+              "superposition": "2",
+              "limitCountPerOrder": 10
+          },
+          {
+              "code": "7rii9fwy4xk_t",
+              "couponId": "dfc9fab9a9ce4cbfb44c15274f6f1e79",
+              "selected": false,
+              "status": "available",
+              "name": "停车券(可叠加)",
+              "expirationDate": "2023-06-16 23:59:59",
+              "discountFee": 5,
+              "defaultSelected": false,
+              "superposition": "2",
+              "limitCountPerOrder": 10
+          },
+          {
+              "code": "54jvpe82n7o_t",
+              "couponId": "dfc9fab9a9ce4cbfb44c15274f6f1e79",
+              "selected": false,
+              "status": "available",
+              "name": "停车券(可叠加)",
+              "expirationDate": "2023-06-16 23:59:59",
+              "discountFee": 5,
+              "defaultSelected": false,
+              "superposition": "2",
+              "limitCountPerOrder": 10
+          },
+          {
+              "code": "a3m48ifdg8r_t",
+              "couponId": "ff54436ae9a14842953e829ac4a942ef",
+              "selected": false,
+              "status": "available",
+              "name": "停车券(不可叠加)",
+              "expirationDate": "2023-06-24 23:59:59",
+              "discountFee": 5,
+              "defaultSelected": false,
+              "superposition": "1",
+              "limitCountPerOrder": 0
+          },
+          {
+              "code": "47xz1i4uslu_t",
+              "couponId": "ff54436ae9a14842953e829ac4a942ef",
+              "selected": false,
+              "status": "available",
+              "name": "停车券(不可叠加)",
+              "expirationDate": "2023-06-24 23:59:59",
+              "discountFee": 5,
+              "defaultSelected": false,
+              "superposition": "1",
+              "limitCountPerOrder": 0
+          },
+          {
+              "code": "gn73ktfbdda_t",
+              "couponId": "ff54436ae9a14842953e829ac4a942ef",
+              "selected": false,
+              "status": "available",
+              "name": "停车券(不可叠加)",
+              "expirationDate": "2023-06-24 23:59:59",
+              "discountFee": 5,
+              "defaultSelected": false,
+              "superposition": "1",
+              "limitCountPerOrder": 0
+          }
+      ],
+      "paperCoupons": [
+          {
+              "description": "纸质优惠券允许叠加使用,可在该小程序端、自助缴费机,出口设备上进行核销,不受每日最高8小时优惠限制",
+              "selected": false
+          }
+      ]
+  },
+  "parkingRule": {
+      "maxOneDayDiscountFee": 35,
+      "enableNewMemberPoints": false,
+      "enablePoints": true,
+      "unLimitWeekendPoints": false,
+      "enableCoupon": true,
+      "enablePaperCoupons": true,
+      "enableConsume": true,
+      "enableConsumeNonSplit": false,
+      "maxConsumeTime": 7,
+      "remainConsumeTime": 7,
+      "availableDiscountFee": 35,
+      "hourPrice": 5,
+      "oneTimeLimitation": false,
+      "oneDayLimitation": true
+  },
+  "parkInfo": {
+      "parkName": "沈阳嘉里城停车场\t",
+      "description": "计费基础规则:5元每小时,上不封顶\n首停减免:1小时/次/天\n会员等级减免:芳华卡每日可免费停车1小时,倾城卡每日可免费停车2小时,金玉卡每日可免费停车3小时(当日仅限使用1次,可与其他减免优惠共享)\n积分抵扣:芳华卡500积分抵扣1小时,倾城卡400积分抵扣1小时,金玉卡300积分抵扣1小时(手动选择抵扣时长)\n消费减免:当日消费每满200元赠送1小时停车时长,每天赠送8小时封顶(仅限会员,当日有效)\n\n注意事项  \n1.沈阳嘉里城停车场开放时间:24小时。\n2.每日最多享首停+会员权益减免(包含会员消费减免)免费停车8小时。\n3.会员等级减免仅限本人使用,每日每位会员只能为一辆车做会员等级减免,每辆车每日只接受一个会员的等级减免。\n4.每张消费小票仅可为1辆车做会员消费减免。\n5.积分兑换停车时长、纸质优惠券没有任何限制。",
+      "parkMallCode": 4,
+      "buildingId": "SKC-P1"
+  }
+}

+ 154 - 0
src/api/mockData/checkout.sy3.response.json

@@ -0,0 +1,154 @@
+{
+    "parkingRecord": {
+      "vehicleNo": "鲁A10005", 
+      "enterTime": "2023-06-13 11:53:01", 
+      "serviceMin": 3238, 
+      "totalFee": 16000, 
+      "actualPayFee": 150, 
+      "thirdPartyId": "_1_71a6cc7e_1686822661622", 
+      "thirdParkOrderNo": "71a6cc7e526e4cff91aa4f62ab2743f7", 
+      "createdByQrCode": false, 
+      "totalFeeInYuan": 160
+    }, 
+    "discountInfo": {
+      "usingTotalDiscount": 10, 
+      "memberLevelDiscount": false, 
+      "consume": [
+        {
+          "defaultSelected": true, 
+          "maxDiscountTime": 2, 
+          "defaultDiscountTime": 2, 
+          "discountFee": 10, 
+          "redeemSalesAmount": 400
+        }
+      ], 
+      "points": [
+        {
+          "available": 0, 
+          "pointsPerUnit": 100, 
+          "unitAmount": 5, 
+          "totalAvailable": 0, 
+          "unitHour": 1, 
+          "newMember": false, 
+          "label": "0积分可减免"
+        }
+      ], 
+      "coupons": [
+        {
+          "code": "w5xyzlcamie_t", 
+          "couponId": "ff54436ae9a14842953e829ac4a942ef", 
+          "status": "available", 
+          "name": "停车券(不可叠加)", 
+          "expirationDate": "2023-06-24 23:59:59", 
+          "discountFee": 5, 
+          "defaultSelected": false, 
+          "superposition": "1", 
+          "limitCountPerOrder": 0
+        }, 
+        {
+          "code": "gsj9ezvrtve_t", 
+          "couponId": "ff54436ae9a14842953e829ac4a942ef", 
+          "status": "available", 
+          "name": "停车券(不可叠加)", 
+          "expirationDate": "2023-06-24 23:59:59", 
+          "discountFee": 5, 
+          "defaultSelected": false, 
+          "superposition": "1", 
+          "limitCountPerOrder": 0
+        }, 
+        {
+          "code": "zo72eetgs6j_t", 
+          "couponId": "dfc9fab9a9ce4cbfb44c15274f6f1e79", 
+          "status": "available", 
+          "name": "停车券(可叠加)", 
+          "expirationDate": "2023-06-16 23:59:59", 
+          "discountFee": 5, 
+          "defaultSelected": false, 
+          "superposition": "2", 
+          "limitCountPerOrder": 10
+        }, 
+        {
+          "code": "xy2k0rfplvx_t", 
+          "couponId": "dfc9fab9a9ce4cbfb44c15274f6f1e79", 
+          "status": "available", 
+          "name": "停车券(可叠加)", 
+          "expirationDate": "2023-06-16 23:59:59", 
+          "discountFee": 5, 
+          "defaultSelected": false, 
+          "superposition": "2", 
+          "limitCountPerOrder": 10
+        }, 
+        {
+          "code": "mxn6iotingh_t", 
+          "couponId": "dfc9fab9a9ce4cbfb44c15274f6f1e79", 
+          "status": "available", 
+          "name": "停车券(可叠加)", 
+          "expirationDate": "2023-06-16 23:59:59", 
+          "discountFee": 5, 
+          "defaultSelected": false, 
+          "superposition": "2", 
+          "limitCountPerOrder": 10
+        }, 
+        {
+          "code": "uuos3fymfmc_t", 
+          "couponId": "dfc9fab9a9ce4cbfb44c15274f6f1e79", 
+          "status": "available", 
+          "name": "停车券(可叠加)", 
+          "expirationDate": "2023-06-16 23:59:59", 
+          "discountFee": 5, 
+          "defaultSelected": false, 
+          "superposition": "2", 
+          "limitCountPerOrder": 10
+        }, 
+        {
+          "code": "irywl0z2zro_t", 
+          "couponId": "dfc9fab9a9ce4cbfb44c15274f6f1e79", 
+          "status": "available", 
+          "name": "停车券(可叠加)", 
+          "expirationDate": "2023-06-16 23:59:59", 
+          "discountFee": 5, 
+          "defaultSelected": false, 
+          "superposition": "2", 
+          "limitCountPerOrder": 10
+        }, 
+        {
+          "code": "58i7jpopf1c_t", 
+          "couponId": "dfc9fab9a9ce4cbfb44c15274f6f1e79", 
+          "status": "available", 
+          "name": "停车券(可叠加)", 
+          "expirationDate": "2023-06-16 23:59:59", 
+          "discountFee": 5, 
+          "defaultSelected": false, 
+          "superposition": "2", 
+          "limitCountPerOrder": 10
+        }
+      ], 
+      "paperCoupons": [
+        {
+          "description": "纸质优惠券允许叠加使用,可在该小程序端、自助缴费机,出口设备上进行核销,不受每日最高8小时优惠限制"
+        }
+      ]
+    }, 
+    "parkingRule": {
+      "maxOneDayDiscountFee": 35, 
+      "enableNewMemberPoints": false, 
+      "enablePoints": true, 
+      "unLimitWeekendPoints": false, 
+      "enableCoupon": true, 
+      "enablePaperCoupons": true, 
+      "enableConsume": true, 
+      "enableConsumeNonSplit": false, 
+      "maxConsumeTime": 7, 
+      "remainConsumeTime": 2, 
+      "availableDiscountFee": 10, 
+      "hourPrice": 5, 
+      "oneTimeLimitation": false, 
+      "oneDayLimitation": true
+    }, 
+    "parkInfo": {
+      "parkName": "沈阳嘉里城停车场\t", 
+      "description": "计费基础规则:5元每小时,上不封顶\n首停减免:1小时/次/天\n会员等级减免:芳华卡每日可免费停车1小时,倾城卡每日可免费停车2小时,金玉卡每日可免费停车3小时(当日仅限使用1次,可与其他减免优惠共享)\n积分抵扣:芳华卡500积分抵扣1小时,倾城卡400积分抵扣1小时,金玉卡300积分抵扣1小时(手动选择抵扣时长)\n消费减免:当日消费每满200元赠送1小时停车时长,每天赠送8小时封顶(仅限会员,当日有效)\n\n注意事项  \n1.沈阳嘉里城停车场开放时间:24小时。\n2.每日最多享首停+会员权益减免(包含会员消费减免)免费停车8小时。\n3.会员等级减免仅限本人使用,每日每位会员只能为一辆车做会员等级减免,每辆车每日只接受一个会员的等级减免。\n4.每张消费小票仅可为1辆车做会员消费减免。\n5.积分兑换停车时长、纸质优惠券没有任何限制。", 
+      "parkMallCode": 4, 
+      "buildingId": "SKC-P1"
+    }
+  }

+ 1 - 0
src/pages/parkingFee/mixins/parkingFeeCoupon.js

@@ -104,6 +104,7 @@ export default {
           // 验证剩余优惠券是否可勾选(无需验证:后端已计算可勾选的优惠券)
           this.newGroupedCouponData()
           this.setAllDisabled()
+          this.isDisabledByRule(this.couponList[0], 0, 'showMsg');
         })
       }
     },

+ 1 - 1
src/store/order/index.js

@@ -1,4 +1,4 @@
-import checkOutQHResponse from "@/api/mockData/checkout.sy1.response.json";
+import checkOutQHResponse from "@/api/mockData/checkout.sy3.response.json";
 import { checkOut,calculateDiscount,ordersAndPrepay,currentUnlicensedPlate,unlicensedCarCheckIn,unlicensedCarCheckout } from '@/api/parking';
 import state from "@/store/order/state";
 import mutations from "@/store/order/mutations";

+ 1 - 1
vue.config.js

@@ -124,7 +124,7 @@ module.exports = {
       '/msApi': {
         // target: 'https://dev-kip-service-internal.kerryonvip.com/temporary-parking-service', //代理地址,这里设置的地址会代替axios中设置的baseURL
         // target: 'https://qa-apim.kerryplus.com/c/api/temporary-parking-service', //代理地址,这里设置的地址会代替axios中设置的baseURL
-        target: 'http://172.20.50.166:8080', // 代理地址,这里设置的地址会代替axios中设置的baseURL
+        target: 'http://172.21.200.122:8080', // 代理地址,这里设置的地址会代替axios中设置的baseURL
         changeOrigin: true, // 如果接口跨域,需要进行这个参数配置
         //ws: true, // proxy websockets
         //pathRewrite方法重写url