react_hsbc_teller 1.9.5 → 1.9.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react_hsbc_teller",
-  "version": "1.9.5",
+  "version": "1.9.7",
   "description": "React",
   "private": false,
   "main": "lib/hsbc.js",

package/packages/demo/demo.js

@@ -7,16 +7,16 @@ class Demo extends Component {
     shareMask: false,
     imRoomId
     : 
-    "IZLZMoTxj@conference.ls-im-xmpp.chinawp.dev.ali.cloud.cn.hsbc",
+    "vVwWYL84k@conference.ls-im-xmpp.chinawp.dev.ali.cloud.cn.hsbc",
     sessionId
     : 
-    "IZLZMoTxj",
+    "vVwWYL84k",
     mtoken
 : 
-"bc084d8a922f",
+"d6544d018d07",
 roomId
 : 
-"663912632731275",
+"664439964321531",
     // roomId: '',
     // mtoken: '',
     // imRoomId: '',

package/packages/pages/video/video.jsx

@@ -343,7 +343,8 @@ class Video extends Component {
     faceFailReason: '',
     cardResuly: '',
     cardFailReason: '',
-    videoType: ''
+    videoType: '',
+    certificateValidityType: true,
   };
   // eslint-disable-next-line no-undef
   test_controller = '';
@@ -351,7 +352,7 @@ class Video extends Component {
   saveLog = (val) => {
     axios({
       method: 'get',
-      baseURL: this.props.logUrl + '&message=' + encodeURIComponent(val) + '&react_hsbc_teller=1.9.5&logTime=' + Date.now() + '&mtoken=' + encodeURIComponent(this.state.rtoken) + '&roomId=' + encodeURIComponent(this.state.channelId) + '&sessionId=' + encodeURIComponent(this.state.sessionId) + '&appointmentID=' + this.props.businessNumber,
+      baseURL: this.props.logUrl + '&message=' + encodeURIComponent(val) + '&react_hsbc_teller=1.9.7&logTime=' + Date.now() + '&mtoken=' + encodeURIComponent(this.state.rtoken) + '&roomId=' + encodeURIComponent(this.state.channelId) + '&sessionId=' + encodeURIComponent(this.state.sessionId) + '&appointmentID=' + this.props.businessNumber,
 
     }).then(res => {
 
@@ -776,7 +777,48 @@ class Video extends Component {
   };
   errorCodeClick=(type,value)=>{
     if(type == 'ocr'){
-
+      if(value == 100701 || value == 100702 || value == 200001 || value == 300901 || value == 300902 || value == 400001) {
+        this.setState({
+          cardFailReason: '证件图片不清晰，请重试。返回重拍时，请检查并确保身份证件图片信息完整清晰后再提交核查。[#'+value+'#]'
+        })
+      }
+      if(value == 100803 || value == 100804 || value == 100805) {
+        this.setState({
+          cardFailReason: '证件信息核查失败，请重试。返回重拍时，请检查并确保身份证件图片信息完整清晰后再提交核查。[#'+value+'#]'
+        })
+      }
+      if(value == 100801 || value == 100802) {
+        this.setState({
+          cardFailReason: '系统或网络连接异常，请重试。若仍有问题，请联系Support同事。[#'+value+'#]'
+        })
+      }
+      if(value == 30002 || value == 20002 || value == 40002 || value == 50002 ) {
+        this.setState({
+          cardFailReason: '识别成功-证件已过期。[#'+value+'#]'
+        })
+      }
+    } else if(type == 'face') {
+      if(value == 201 || value == 202 || value == 203 || value == 401 || value == 428) {
+        this.setState({
+          faceFailReason: '用户信息有误。请再次检查客户提交的证件信息是否正确后，返回重试。若仍有问题，请联系Support同事解决。[#'+ value + '#]'
+        })
+      }else if(value == 204) {
+        this.setState({
+          faceFailReason: '用户信息核查未通过。请返回重试。返回重拍时，请检查并确保客户照片完整清晰后再提交核查。[#'+ value + '#]'
+        })
+      }else if(value == 209) {
+        this.setState({
+          faceFailReason: '用户信息核查未通过。请确认客户与其提供的证件信息一致后，再提交核查。[#'+ value + '#]'
+        })
+      } else {
+        this.setState({
+          faceFailReason: '用户信息核查无法处理，请重试。若仍有问题，请联系Support同事。[#'+ value + '#]'
+        })
+      }
+      
+      
+      
+      
     }
   }
   contrastFaceVerify = async () => {
@@ -791,7 +833,7 @@ class Video extends Component {
         fileBase64: this.state.facialImg.replace(/^data:image\/\w+;base64,/, "")
       });
       console.log(result);
-      if (result.code == 200 || result.code == 201) {
+      if (result.code == 200 || result.code == 210) {
         // this.messageClick('人脸识别成功','success')
         this.setState({
           loadingFace: false,
@@ -808,8 +850,9 @@ class Video extends Component {
           loadingFace: false,
           faceResuly: 'fail',
           isFaceImage: '',
-          faceFailReason: result.message
+          // faceFailReason: result.message
         })
+        this.errorCodeClick('face',result.code)
       }
 
 
@@ -822,8 +865,9 @@ class Video extends Component {
         loadingFace: false,
         faceResuly: 'fail',
         isFaceImage: '',
-        faceFailReason: err.message
+        // faceFailReason: err.message
       })
+      this.errorCodeClick('face',result.code)
       console.error('err', err);
     }
   };
@@ -3834,7 +3878,7 @@ class Video extends Component {
     }
   }
   componentWillMount() {
-    console.log('hsbc_teller_sdk', '1.9.5')
+    console.log('hsbc_teller_sdk', '1.9.7')
     if (this.props.sessionId) {
       this.getRoomStatus({
         sessionId: this.props.sessionId
@@ -4293,20 +4337,71 @@ class Video extends Component {
         });
         if(this.state.documentType == 'ID_CARD') {
           if (result.data.side == 'front') {
-            this.setState({
-              // isModalVisibleFacial: false
-              idCardNumber: result.data.idCardNumber,
-              idCardName: result.data.idCardName
-            })
-            this.ocrCallback(2)
+            if(this.state.certificateValidity) {
+              if(this.dateNewTime(this.state.certificateValidity.split('-')[1])){
+                this.setState({
+                  idCardNumber: result.data.idCardNumber,
+                  idCardName: result.data.idCardName,
+                  loadingFace: false,
+                  cardFailReason: '',
+                  cardResuly: 'success',
+                })
+              } else {
+                this.setState({
+                  idCardNumber: result.data.idCardNumber,
+                  idCardName: result.data.idCardName,
+                  certificateValidityType: false,
+                  cardFailReason: '证件不在有效期内',
+                  loadingFace: false,
+                  cardResuly: 'success',
+                })
+              }
+              
+            } else {
+              this.setState({
+                // isModalVisibleFacial: false
+                idCardNumber: result.data.idCardNumber,
+                idCardName: result.data.idCardName
+              })
+              this.ocrCallback(2)
+            }
           } else if (result.data.side == 'back') {
             console.log(result.data.startDate, result.data.endDate)
-            this.setState({
-              certificateValidity: result.data.startDate + '-' + result.data.endDate,
-              loadingFace: false,
-              cardFailReason: '',
-              cardResuly: 'success',
-            })
+            if(this.state.idCardName && this.dateNewTime(result.data.endDate)) {
+              this.setState({
+                certificateValidity: result.data.startDate + '-' + result.data.endDate,
+                loadingFace: false,
+                cardFailReason: '',
+                cardResuly: 'success',
+                certificateValidityType: true,
+              })
+            } else if(this.state.idCardName && !this.dateNewTime(result.data.endDate)) {
+              this.setState({
+                certificateValidity: result.data.startDate + '-' + result.data.endDate,
+                loadingFace: false,
+                certificateValidityType: false,
+                cardFailReason: '证件不在有效期内',
+                cardResuly: 'success',
+              })
+            } else if(!this.state.idCardName) {
+              this.setState({
+                certificateValidity: result.data.startDate + '-' + result.data.endDate,
+              })
+              this.ocrCallback(2)
+            }
+            // if(this.state.idCardName) {
+            //   this.setState({
+            //     certificateValidity: result.data.startDate + '-' + result.data.endDate,
+            //     loadingFace: false,
+            //     cardFailReason: '',
+            //     cardResuly: 'success',
+            //   })
+            // } else {
+            //   this.setState({
+            //     certificateValidity: result.data.startDate + '-' + result.data.endDate,
+            //   })
+            //   this.ocrCallback(2)
+            // }
           }
         }
         if(this.state.documentType == 'HK_MO_RESIDENCE_CARD' || this.state.documentType == 'TW_RESIDENCE_CARD') {
@@ -4352,17 +4447,19 @@ class Video extends Component {
       } else {
         this.setState({
           loadingFace: false,
-          cardFailReason: result.message,
+          // cardFailReason: result.message,
           cardResuly: 'fail',
         })
-        this.messageClick('识别失败', 'error')
+        // this.messageClick('识别失败', 'error')
+        this.errorCodeClick('ocr',result.code)
       }
     } catch (err) {
       this.setState({
         loadingFace: false,
-        cardFailReason: err.response.message,
+        // cardFailReason: err.response.message,
         cardResuly: 'fail',
       })
+      this.errorCodeClick('ocr',err.response.code)
       
       // this.messageClick('识别失败', 'error')
     }
@@ -4622,6 +4719,7 @@ class Video extends Component {
         idCardName: '',
         cardFailReason: '',
         cardResuly: '',
+        certificateValidityType: true
       }, () => {
 
 
@@ -5296,7 +5394,7 @@ class Video extends Component {
         content: JSON.stringify({
           'typeId': 1223,
           'sessionId': this.state.sessionId,
-          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId1').innerText).uid
+          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId2').innerText).uid
         })
       });
     } if (value == 'video3') {
@@ -5305,7 +5403,7 @@ class Video extends Component {
         content: JSON.stringify({
           'typeId': 1223,
           'sessionId': this.state.sessionId,
-          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId1').innerText).uid
+          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId3').innerText).uid
         })
       });
     } if (value == 'video4') {
@@ -5314,7 +5412,7 @@ class Video extends Component {
         content: JSON.stringify({
           'typeId': 1223,
           'sessionId': this.state.sessionId,
-          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId1').innerText).uid
+          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId4').innerText).uid
         })
       });
     } if (value == 'video5') {
@@ -5323,7 +5421,7 @@ class Video extends Component {
         content: JSON.stringify({
           'typeId': 1223,
           'sessionId': this.state.sessionId,
-          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId1').innerText).uid
+          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId5').innerText).uid
         })
       });
     } if (value == 'video6') {
@@ -5332,7 +5430,7 @@ class Video extends Component {
         content: JSON.stringify({
           'typeId': 1223,
           'sessionId': this.state.sessionId,
-          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId1').innerText).uid
+          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId6').innerText).uid
         })
       });
     } if (value == 'video7') {
@@ -5341,7 +5439,7 @@ class Video extends Component {
         content: JSON.stringify({
           'typeId': 1223,
           'sessionId': this.state.sessionId,
-          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId1').innerText).uid
+          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId7').innerText).uid
         })
       });
     } if (value == 'video8') {
@@ -5350,7 +5448,7 @@ class Video extends Component {
         content: JSON.stringify({
           'typeId': 1223,
           'sessionId': this.state.sessionId,
-          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId1').innerText).uid
+          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId8').innerText).uid
         })
       });
     } if (value == 'video9') {
@@ -5359,7 +5457,7 @@ class Video extends Component {
         content: JSON.stringify({
           'typeId': 1223,
           'sessionId': this.state.sessionId,
-          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId1').innerText).uid
+          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId9').innerText).uid
         })
       });
     }
@@ -5369,7 +5467,7 @@ class Video extends Component {
         content: JSON.stringify({
           'typeId': 1223,
           'sessionId': this.state.sessionId,
-          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId1').innerText).uid
+          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId10').innerText).uid
         })
       });
     }
@@ -5379,7 +5477,7 @@ class Video extends Component {
         content: JSON.stringify({
           'typeId': 1223,
           'sessionId': this.state.sessionId,
-          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId1').innerText).uid
+          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId11').innerText).uid
         })
       });
     }
@@ -5389,7 +5487,7 @@ class Video extends Component {
         content: JSON.stringify({
           'typeId': 1223,
           'sessionId': this.state.sessionId,
-          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId1').innerText).uid
+          'userId': this.seeList(this.state.roomCustomerList, 'feedId', document.getElementById('feedId12').innerText).uid
         })
       });
     }
@@ -5431,8 +5529,43 @@ class Video extends Component {
   handleChangeIdCardNumber = (event) => {
     this.setState({ idCardNumber: event.target.value });
   }
+  dateNewTime=(value)=>{
+    var myDate = new Date();
+    var year = myDate.getFullYear();
+    var month = myDate.getMonth() + 1;
+    var dates = myDate.getDate();
+    var value1 = year + '.' + month + '.' + dates
+    var now = new Date(value1).valueOf();
+    var time = new Date(value).valueOf();
+    console.log(now,time)
+    if(now<time || now == time){
+      return true;
+    }else{
+      return false;
+    }
+  }
   handleChangeCertificateValidity = (event) => {
-    this.setState({ certificateValidity: event.target.value });
+    if(this.state.documentType == 'ID_CARD' && event.target.value.split('-').length >1 && event.target.value.split('-')[1].split('.').length >2) {
+      if(this.dateNewTime(event.target.value.split('-')[1])) {
+        this.setState({ 
+          certificateValidity: event.target.value,
+          certificateValidityType: true
+        });
+        
+      } else {
+        this.setState({ 
+          certificateValidity: event.target.value,
+          certificateValidityType: false
+        });
+      }
+    } else{
+      this.setState({ 
+        certificateValidity: event.target.value,
+      });
+    }
+    
+    
+
   }
   componentDidUpdate(prevProps) {
     console.log('componentDidUpdate', prevProps, prevProps.shareMask, this.props.shareMask)
@@ -6260,7 +6393,10 @@ class Video extends Component {
                 this.state.disabledIdCard && <Button className="modelButtonFaceOk" danger onClick={(e) => this.updateConfirm('noFace')}>修改</Button>
               }
               {
-                this.state.documentType == 'ID_CARD' && <Button className="modelButtonFaceOkColor" danger onClick={(e) => this.confirmCallback('face')}>完成并发起人脸识别</Button>
+                this.state.documentType == 'ID_CARD' && this.state.certificateValidityType && <Button className="modelButtonFaceOkColor" danger onClick={(e) => this.confirmCallback('face')}>完成并发起人脸识别</Button>
+              }
+              {
+                this.state.documentType == 'ID_CARD' && !this.state.certificateValidityType && <Button className="modelButtonFaceOkColorFile" danger >完成并发起人脸识别</Button>
               }
               {
                 this.state.documentType != 'ID_CARD' && <Button className="modelButtonOk" type="primary" danger onClick={(e) => this.confirmCallback('noFace')}>完成</Button>
@@ -6303,8 +6439,14 @@ class Video extends Component {
                     {
                       this.state.cardResuly == 'success' && <div className='successClassFace'>
                         <img src={require("../../assets/img/tooltips1_pass.png").default} alt="" ></img>
-          
-                        识别成功</div>
+                        {
+                          this.state.cardFailReason && <span>识别成功 -- {this.state.cardFailReason}</span>
+                        }
+                        {
+                          !this.state.cardFailReason && <span>识别成功</span>
+                        }
+                        
+                        </div>
                     }
                     {
                       this.state.cardResuly == 'fail' && <div className='errorClassFace'>

package/packages/pages/video/video.less

@@ -414,6 +414,15 @@
   background: #DB0011!important;
   border-spacing: 20px!important;
 }
+.modelButtonFaceOkColorFile{
+  width: 170px!important;
+  height: 40px!important;
+  font-size: 16px!important;
+  color: #5C5C5C!important;
+  border: 1px #5C5C5C solid!important;
+  background: #d9d9d9!important;
+  border-spacing: 20px!important;
+}
 .endModal{
   font-size: 16px;
     padding: 56px 30px 0px 30px;