Merge pull request #24 from John-Hong/John/Microservices

John/microservices

src/App.vue

@@ -192,7 +192,7 @@ export default {
         // window.profileApi = 'https://qa-apim.kerryplus.com/c/api';
         // window.api = 'qaApi';
         window.env = 'dev';
-        window.profileApi = 'https://dev-gateway-kip.kerryonvip.com/c/api';
+        window.profileApi = 'https://dev-gateway-kip.kerryonvip.com/api';
         window.api = 'devApi';
         return;
       }

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"
+  }
+}

src/api/request.js

@@ -11,7 +11,7 @@ import { Toast } from 'vant';
 import vue from 'vue';
 import store from '@/store';
 import { v4 as uuidv4 } from 'uuid';
-
+import { wxToLoginCallback } from '@/utils/index.js'
 let loadingInstance = null;
 let requestNum = 0;
 
@@ -83,63 +83,27 @@ const cancelLoading = () => {
 };
 
 function XUser(config) {
-  /*'X-User': JSON.stringify({"userId": "5106534569910475","sourceType": "WECHAT","nickName": "yedUsFwdkelQbxeTeQOvaScfqIOOmaa","mobile": "18521563898","projectId": "paroject1","buildingId": "shenzhen01","cid": "8aaa809d835ba76d018378bc57180006","vipCode":"KERRY100213505"})*/
-  /*'X-User': JSON.stringify({
-   // userId: store.state.member.id, // K+用户ID
-   userId: '36cec68f3a9a4f4b9e04a59268ba20f2', // K+用户ID
-   sourceType: 'WECHAT', // 登录来源: WECHAT/ALIPAY/H5/APP
-   cId: store.state.openid, // 终端用户ID, 微信端传openId, 支付宝小程序传阿里userId, APP传KIP的userId
-   // projectId: store.state.member.groupId, // 楼盘id
-   projectId: store.state.projectId || '4028e3817c2b3f79017c2b48c54c0000', // 楼盘id
-   // buildingId: store.state.member.mallid, // 楼栋id
-   // buildingId: '8aaa80b47c784020017c78b00d060022', // 楼栋id
-   // buildingId: store.state.buildingId || 'shenzhen01', // 楼栋id
-   buildingId: store.state.buildingId || 'QHKC-P1', // 楼栋id
-   phoneNumber: store.state.mobile, // 终端用户ID, 微信端传openId, 支付宝小程序传阿里userId, APP传KIP的userId
-   // vipCode: store.state.member.vipcode, // 终端用户ID, 微信端传openId, 支付宝小程序传阿里userId, APP传KIP的userId
-   // vipCode: 'KERRY100213815', // 终端用户ID, 微信端传openId, 支付宝小程序传阿里userId, APP传KIP的userId
-   vipCode: 'KERRY100213505', // 终端用户ID, 微信端传openId, 支付宝小程序传阿里userId, APP传KIP的userId
-   lbsId: '8aaa87bc7ce98224017ce995fd8a0002', // 楼盘ID
-   })*/
-  // console.log('101101101101',  store.state.member);
-  const params = {
-    // userId: '8aaa828583bbbc030183cf34b536000a',
-    // userId: store.state.kipUserId, // K+用户ID
-    userId: '2c9d85868652dee50186532bdbbb0001', // K+用户ID
+  let params = {
+    userId: store.state?.kipUserId || '', // K+用户ID
+    // userId: '2c9d85868652dee50186532bdbbb0001', // K+用户ID
     sourceType: 'WECHAT',
     // phoneNumber: '18521563898',
-    phoneNumber: store.state.mobile, // 终端用户ID, 微信端传openId, 支付宝小程序传阿里userId, APP传KIP的userId
-    // projectId: 'paroject1',
-    projectId: store.state.projectId || '4028e3817c2b3f79017c2b48c54c0000', // 楼盘id
-    // buildingId: 'QHKC-P1',
-    // buildingId: window.localStorage.getItem('buildingId'),
+    phoneNumber: store.state?.mobile || '', // 终端用户ID, 微信端传openId, 支付宝小程序传阿里userId, APP传KIP的userId
+    // projectId: store.state.projectId || '4028e3817c2b3f79017c2b48c54c0000', // 楼盘id
+    projectId: store.state.projectId || '', // 楼盘id
     brandId: store.state.groupId,
-    // brandId: '8aaa81947c6e1ca0017c73c13cc30006',
-    // brandId: store.state.brandId,
     // cid: '8aaa809d835ba76d018378bc57180006',
-    cid: store.state.openid, // 终端用户ID, 微信端传openId, 支付宝小程序传阿里userId, APP传KIP的userId
+    cid: store.state?.openid || '', // 终端用户ID, 微信端传openId, 支付宝小程序传阿里userId, APP传KIP的userId
     // vipCode: 'KERRY100213505',
-    // vipCode: store.state.member.vipcode, // 终端用户ID, 微信端传openId, 支付宝小程序传阿里userId, APP传KIP的userId
-    vipCode: 'KERRY100213853', // 终端用户ID, 微信端传openId, 支付宝小程序传阿里userId, APP传KIP的userId
-    // vipCode: 'KERRY100213851', // 终端用户ID, 微信端传openId, 支付宝小程序传阿里userId, APP传KIP的userId
-    lbsId: '8aaa82ea804d07cd0180516ff03b0008',
-    // lbsId: store.state.lbsId,
+    vipCode: store.state?.member?.vipcode || '', // 终端用户ID, 微信端传openId, 支付宝小程序传阿里userId, APP传KIP的userId
+    // vipCode: 'KERRY100213853', // 终端用户ID, 微信端传openId, 支付宝小程序传阿里userId, APP传KIP的userId
+    // lbsId: '8aaa82ea804d07cd0180516ff03b0008',
+    lbsId: store.state?.lbsId || '',
   };
-  /*const params = {
-   userId: '5106534569910475',
-   sourceType: 'WECHAT',
-   nickName: 'yedUsFwdkelQbxeTeQOvaScfqIOOmaa',
-   mobile: '18521563898',
-   projectId: 'paroject1',
-   buildingId: 'shenyang01',
-   cid: '8aaa809d835ba76d018378bc57180006',
-   vipCode: 'KERRY100213853',
-   lbsId: '8aaa82ea804d07cd0180516ff03b0008',
-   };*/
+  // params = {"userId":"8aaa809d835ba76d018377d482ac0004","sourceType":"WECHAT","phoneNumber":"15090631337","projectId":"","brandId":"8aaa81947c6e1ca0017c73c13cc30006","cid":"oudWQ5ccsJLSlUGt0s_RQysoHqgg","vipCode":"KERRY100213432","lbsId":"8aaa82ea804d07cd0180516ff03b0008"}
   if (/orders-and-prepay|calculate-discount|unlicensed-car-check-in/.test(config.url)) {
     params.buildingId = window.localStorage.getItem('buildingId');
   }
-  console.log(140140140140, params);
   return JSON.stringify(params);
 }
 function getSign(config) {
@@ -148,13 +112,12 @@ function getSign(config) {
     params = config.params
   }
   if(config.method === 'post' && config?.data) {
-    params = JSON.parse(config.data)
+    params = config.data
   }
   const newHeader = md(params, true)
   return newHeader
 }
 export const createAxiosByinterceptors = (config) => {
-  console.log('接口返送出去的config', config);
   const instance = axios.create({
     timeout: 100000, //超时配置
     baseURL: `${window.profileApi}/temporary-parking-service`,
@@ -167,7 +130,6 @@ export const createAxiosByinterceptors = (config) => {
     function (config) {
       // 在发送请求之前做些什么
       const { loading = true } = config;
-      console.log('接口返送出去的config160:', config);
       if (loading) addLoading();
       // 设置 headers
       config.headers = {
@@ -177,9 +139,6 @@ export const createAxiosByinterceptors = (config) => {
         'XConversationId': uuidv4(),
         'X-User': XUser(config),
       };
-      // console.log(111111, config.headers, handleConfig().header)
-      // console.log(111111, handleConfig().header)
-      // console.log(123, config);
       return config;
     },
     function (error) {
@@ -200,29 +159,14 @@ export const createAxiosByinterceptors = (config) => {
       // TODO: 临时注释
       // Promise.reject(response.data)
       return response.data;
-      /*if (code === 200) return data;
-       else if (code === 401) {
-       // 跳转到登陆
-       // jumpLogin();
-       } else {
-       // 错误信息提示
-       // Message.error(message);
-       Toast({
-       message: message,
-       });
-       return Promise.reject(response.data);
-       }*/
     },
     function (error) {
-      // console.log(158, error.response.data)
-
       // 对响应错误做点什么
       console.log('error-response:', error.response);
       console.log('error-config:', error.config);
       console.log('error-request:', error.request);
       const { loading = true } = error.config || {};
       if (loading) cancelLoading();
-      console.log('79error', error);
       if (error.response) {
         if (error.response.status === 401) {
           // 跳转到登陆
@@ -230,10 +174,10 @@ export const createAxiosByinterceptors = (config) => {
         }
       }
       // 错误信息提示
-      const { code, langMessage } = error.response.data;
-      const codeList = ['INTERNAL_SERVER_ERROR', 'VALIDATION_FAILED', 'CAR_NOT_FOUND', 'CAR_HAS_PLATE']; // 默认处理的错误code
+      const { code, langMessage, message } = error.response.data;
+      const codeList = ['INTERNAL_SERVER_ERROR', 'VALIDATION_FAILED', 'CAR_NOT_FOUND', 'CAR_HAS_PLATE', "NOT_FOUND"]; // 默认处理的错误code
       if (codeList.indexOf(code) > -1) {
-        uni.showToast({ title: langMessage, duration: 3000, icon: 'fail' });
+        uni.showToast({ title: langMessage || message, duration: 3000, icon: 'fail' });
       }
       // Message.error(error?.response?.data?.message || '服务端异常');
       return Promise.reject(error.response.data);

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">

src/pages/parkingFee/mixins/parkingFee.js

@@ -4,6 +4,7 @@ import LoginDom from '@/components/Login/Login.vue';
 import { mapState } from 'vuex';
 import { initWxJsSdkConfig } from '@/utils/login';
 import { getPlatform } from '@/utils/index';
+import { wxToLoginCallback } from '@/utils';
 
 const app = {
   globalData: {
@@ -117,6 +118,19 @@ export default {
     if (platform === 'micromessenger') {
       await initWxJsSdkConfig(['checkJsApi', 'scanQRCode']);
     }
+    const member = uni.getStorageSync('member');
+    console.log(4141, member);
+    if (!member && !uni.getStorageSync('isLogin') && window?.toWXSendMsg) {
+      wxToLoginCallback('parkingFee', (options) => {
+        uni.setStorageSync('isLogin', 'isLogin');
+        // console.log(126, options);
+        // if (options?.noLoginParkingFeeWebView === 'fail') {
+        //   this.loadData();
+        // } else {
+        //   this.$router.back(-1);
+        // }
+      });
+    }
 
     if (this.openid) {
       this.getParkInfo();
@@ -377,6 +391,15 @@ export default {
     },
     // 缴费记录
     doRouter: function () {
+      window?.toWXSendMsg({
+        type: 'uni_func',
+        funcName: 'setStorageSync',
+        options: {
+          key: 'noLoginParkingFeeWebViewPath',
+          value: ''
+        },
+      });
+      uni.setStorageSync('loadData', '');
       if (this.$store.state.isLogin === '3') {
         this.$router.push({ path: 'login' });
         return;
@@ -385,6 +408,15 @@ export default {
     },
     // 车牌管理
     doRouter2: function () {
+      window?.toWXSendMsg({
+        type: 'uni_func',
+        funcName: 'setStorageSync',
+        options: {
+          key: 'noLoginParkingFeeWebViewPath',
+          value: ''
+        },
+      });
+      uni.setStorageSync('loadData', '');
       if (this.$store.state.isLogin === '3') {
         this.$router.push({ path: 'login' });
         return;
@@ -394,6 +426,15 @@ export default {
     },
     //停车发票
     doRouter1: function () {
+      window?.toWXSendMsg({
+        type: 'uni_func',
+        funcName: 'setStorageSync',
+        options: {
+          key: 'noLoginParkingFeeWebViewPath',
+          value: ''
+        },
+      });
+      uni.setStorageSync('loadData', '');
       if (this.$store.state.isLogin === '3') {
         this.$router.push({ path: 'login' });
         return;
@@ -413,6 +454,15 @@ export default {
     },
     //停车券兑换
     doRouter3: function () {
+      window?.toWXSendMsg({
+        type: 'uni_func',
+        funcName: 'setStorageSync',
+        options: {
+          key: 'noLoginParkingFeeWebViewPath',
+          value: ''
+        },
+      });
+      uni.setStorageSync('loadData', '');
       window.toWXSendMsg({
         type: 'toPage',
         options: {
@@ -442,8 +492,8 @@ export default {
     // 无牌车闸机扫码
     async scanCarCode() {
       try {
-        this.qrCodesRule('e41d4d9dd5534f4aa3de88326a2e6f85')
-        return
+        // this.qrCodesRule('e41d4d9dd5534f4aa3de88326a2e6f85')
+        // return
         const runScanFn = (res) => {
           if (res.scanType == 'QR_CODE' && res.scanType) {
             console.log(res.result);

src/pages/parkingFee/mixins/parkingFeeDetail.js

@@ -107,7 +107,7 @@ export default {
   methods: {
     // 前往支付
     async toPay() {
-      const { parkingRecord, discountInfo } = this.orderDetail;
+      const { parkingRecord, discountInfo = {} } = this.orderDetail;
       const { coupons, points } = discountInfo
       try {
         const params = {
@@ -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') {
@@ -320,7 +321,7 @@ export default {
               this.$router.replace({
                 path: 'parkingFeePayment',
                 query: {
-                  msg: res.message,
+                  msg: res.langMessage,
                   vehicleNo: this.$route.query.vehicleNo,
                 },
               });

src/pages/parkingFee/mixins/parkingFeeList.js

@@ -42,53 +42,21 @@ export default {
     canloading = true;
     pageNum = 0;
     const member = uni.getStorageSync('member');
-    console.log(4141, member)
-    this.loadData();
-    return
+    // console.log('用户不走未登录', !uni.getStorageSync('loadData'));
     if (member) {
       this.loadData();
-    } else {
+    } else if(!uni.getStorageSync('loadData')){
       wxToLoginCallback('parkingFeeList', (options) => {
-        console.log(229, options);
+        // console.log(229, options);
+        uni.setStorageSync('loadData', 'loadData')
         if (options?.noLoginParkingFeeWebView === 'fail') {
           this.loadData();
         } else {
           this.$router.back(-1);
         }
       });
-      /* // 前往登录
-       window.toWXSendMsg({
-       type: 'toLogin',
-       options: {
-       path: 'parkingFeeList',
-       },
-       });
-       window.subscribe('callback', (options) => {
-       // resolve(options);
-       console.log(110, options);
-       if (options.isReload) {
-       window.location.reload();
-       } else {
-       this.loadData();
-       }
-       });*/
-      // 登录的回调
-      // this.loadData()
-      /*this.$refs.authorize.login("/pages/parkingFee/parkingFee", () => {
-       this.loadData()
-       });*/
     }
   },
-  // mounted() {
-  //   console.log(123, this.$route)
-  // },
-  // onReachBottom: function() {
-  //   console.log('canloading', canloading)
-  //   if (canloading) {
-  //     pageNum++
-  //     this.loadData()
-  //   }
-  // },
   filters: {
     parkingTime(val) {
       const days = parseInt(val / 60 / 24);
@@ -127,7 +95,7 @@ export default {
       try {
         const res = await orders({
           page: params.page,
-          pageSize: params.pageSize,
+          size: params.pageSize,
         })
         console.log('res2', res);
         // const res = orderMockData

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++;
@@ -324,13 +328,13 @@ const actions = {
     if (type === 'add' && state.pointsTime < maxPointsTime) {
       const pointsTime = state.pointsTime + state.unitAmount;
       // 如果是深圳车场
-      commit('setAvailable', state.available - state.pointsPerUnit / state.unitAmount);
+      commit('setAvailable', state.available - state.pointsPerUnit);
       commit('setPointsTime', pointsTime);
     }
     if (type === 'minus' && state.pointsTime > 0) {
       const pointsTime = state.pointsTime - state.unitAmount;
       // 如果是深圳车场
-      commit('setAvailable', state.available + state.pointsPerUnit / state.unitAmount);
+      commit('setAvailable', state.available + state.pointsPerUnit);
       commit('setPointsTime', pointsTime);
     }
   },

src/utils/index.js

@@ -142,7 +142,7 @@ export function wxToLoginCallback(path, callback) {
       },
     });
     window.subscribe('callback', (options) => {
-      console.log('登录成功之后的回调', JSON.stringify(options));
+      console.log('登录页面的回调', JSON.stringify(options));
       if (options.isReload) {
         window.location.reload();
       } else {

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