刷脸支付分修改

src/models/goods.js

@@ -93,8 +93,5 @@ export default {
     *payscoreinfo(action, {call}) {
       return yield call(api.payscoreinfo, action);
     },
-    *payscoreCheck(action, {call}) {
-      return yield call(api.payscoreCheck, action);
-    },
   },
 };

src/pages/FacePage.js

@@ -69,7 +69,14 @@ class FacePage extends Component {
       await AutoClick.clickBackKey();
       if (this.faceBusy) return;
       this.faceBusy = true;
-      await this.wechatFace(); // 点击开通重新调用
+      // await this.wechatFace(); // 点击开通重新调用
+      if (WxFacepay.getUserPayScoreStatus) {
+        // 开通支付分
+        await this.payscore();
+      } else {
+        // 微信刷脸
+        await this.wechatFace();
+      }
       this.faceBusy = false;
     });
     // 监听微信输入手机号事件
@@ -236,7 +243,19 @@ class FacePage extends Component {
   };
 
   face = () => {
-    this.state.faceType === 'wxpay' ? this.wechatFace() : this.smileFace();
+    const {faceType} = this.state;
+    if (faceType === 'wxpay') {
+      if (WxFacepay.getUserPayScoreStatus && this.sense) {
+        // 开通支付分
+        this.payscore();
+      } else {
+        // 微信刷脸
+        this.wechatFace();
+      }
+    } else {
+      // 支付宝刷脸
+      this.smileFace();
+    }
   };
 
   // device 代表当前打开的门
@@ -274,11 +293,7 @@ class FacePage extends Component {
         let tipText = ret.msg;
         // 判断扣款方式使用支付分还是代扣
         this.payscoreEnable = !!ret.payscoreEnable;
-        if (this.payscoreEnable && ret.code === -10 && this.sense) {
-          Speech.speak('正在开通支付分，请看向屏幕');
-        } else {
-          Speech.speak(tipText);
-        }
+        Speech.speak(tipText);
         this.userId = ret.userId;
         if (ret.code === 401) {
           // 需要验证手机号
@@ -290,11 +305,7 @@ class FacePage extends Component {
         }
         if (ret.code === -10 && this.sense) {
           // 无感设备
-          if (WxFacepay.getUserPayScoreStatus && this.payscoreEnable) {
-            this.openPayScore(ret.action);
-          } else {
-            this.setQrcode({action: ret.action, tip: tipText, qrcode: true}); // 扫码开通免密支付
-          }
+          this.setQrcode({action: ret.action, tip: tipText, qrcode: true}); // 扫码开通免密支付
           return;
         }
         // else if (ret.orders && ret.orders.length > 0) {
@@ -397,6 +408,7 @@ class FacePage extends Component {
         window.socket.connect();
       }
       if (!res.openid) {
+        this.payscoreEnable = false;
         // 返回错误出现二维码扫码
         this.goTips();
         return;
@@ -409,53 +421,17 @@ class FacePage extends Component {
     }
   };
 
-  wxdoor = async () => {
-    this.loading(true);
-    const action = {
-      type: 'store/wxdoor',
-      openid: this.faceinfo.openid,
-      wxtoken: this.faceinfo.token,
-      nickname: this.faceinfo.nickname,
-    };
-    if (validity.phone.test(this.phone)) action.phone = this.phone;
-    if (this.sense) action.sense = true;
-    const ret = await this.props.dispatch(action);
-    this.phone = '';
-    this.loading(false);
-    this.handleDoorLogin(ret);
-  };
-
-  // 刷脸开通支付分
-  openPayScore = async action => {
-    const {orderId, code} = await this.getPayScoreStatus();
-    if (orderId && code) {
-      const {data} = await this.props.dispatch({
-        type: 'goods/payscoreCheck',
-        userId: this.userId,
-        orderId,
-        code,
-      });
-      if (data.code === 1) {
-        await this.wxdoor();
-      } else {
-        const tipText = '请扫码开通支付分';
-        Speech.speak(tipText);
-        this.setQrcode({action, tip: tipText, qrcode: true}); // 扫码开通支付分
-      }
-    } else {
-      const tipText = '请扫码开通支付分';
-      Speech.speak(tipText);
-      this.setQrcode({action, tip: tipText, qrcode: true}); // 扫码开通支付分
-    }
-  };
-
-  // 刷脸查询用户支付分状态
-  getPayScoreStatus = async () => {
+  // 微信人脸身份识别且开通支付分
+  payscore = async () => {
     const {orderDetailsModal, tipsModal} = this.state;
     if (orderDetailsModal || tipsModal) {
       // 出现订单弹窗，不做人脸识别
       return;
     }
+    const tipText = !this.payscoreEnable
+      ? '正在人脸识别，请看向屏幕，靠中间站稳'
+      : '正在开通支付分，请看向屏幕';
+    Speech.speak(tipText);
     const data = await this.payscoreinfo();
     if (data.code === 1) {
       const out_trade_no = data.data.orderId;
@@ -478,12 +454,49 @@ class FacePage extends Component {
           payscore_service_id,
           ask_unionid: 1,
         };
-        WxFacepay.getUserPayScoreStatus(params);
-        return {orderId: out_trade_no, code: payscore_out_request_no};
+        let res = await WxFacepay.getUserPayScoreStatus(params);
+        if (!res.openid && !AutoClick.enable) {
+          // 返回错误自动重新识别
+          res = (await WxFacepay.getUserPayScoreStatus(params)) || {};
+        }
+        if (window.socket) {
+          // 返回结果，立即重新连接socket
+          window.socket.connect();
+        }
+        if (!res.openid) {
+          // 返回错误出现二维码扫码
+          this.payscoreEnable = false;
+          this.goTips();
+          return;
+        }
+        this.faceinfo = {
+          orderId: out_trade_no,
+          authCode: payscore_out_request_no,
+          ...res,
+        };
+        await this.wxdoor();
       }
     }
   };
 
+  wxdoor = async () => {
+    this.loading(true);
+    const action = {
+      type: 'store/wxdoor',
+      openid: this.faceinfo.openid,
+      wxtoken: this.faceinfo.token || '',
+      nickname: this.faceinfo.nickname || '',
+      orderId: this.faceinfo.orderId || '',
+      authCode: this.faceinfo.authCode || '',
+    };
+    if (validity.phone.test(this.phone)) action.phone = this.phone;
+    if (this.sense) action.sense = true;
+    const ret = await this.props.dispatch(action);
+    this.phone = '';
+    this.loading(false);
+    this.handleDoorLogin(ret);
+  };
+
   // 获取用户支付分状态
   payscoreinfo = async () => {
     const {data} = await this.props.dispatch({
@@ -620,8 +633,7 @@ class FacePage extends Component {
   goTips = async () => {
     if (this.payscoreEnable) {
       await this.setState({tipsModal: false});
-      Speech.speak('正在开通支付分，请看向屏幕');
-      this.openPayScore(this.action);
+      this.payscore();
     } else {
       Speech.speak('请扫码开门');
       this.setQrcode({action: this.action, tip: '请扫码开门', qrcode: true});

src/services/goods.js

@@ -70,10 +70,3 @@ export function wxauthinfo({rawdata}) {
 export function payscoreinfo() {
   return axios.post('/store/goods/payscore/info');
 }
-
-export function payscoreCheck({userId, orderId, code}) {
-  return axios.post(
-    '/store/goods/payscore/check',
-    qs.stringify({userId, orderId, code}),
-  );
-}

src/services/store.js

@@ -44,6 +44,8 @@ export function wxdoor({
   fToken,
   phone,
   sense,
+  orderId,
+  authCode,
 }) {
   return axios.post(
     '/store/wxdoor',
@@ -56,6 +58,8 @@ export function wxdoor({
       fToken,
       phone,
       sense,
+      orderId,
+      authCode,
     }),
   );
 }