d

bpo-web/app/base/api/impl/bpoSDPJApi.js

@@ -67,7 +67,6 @@ class BpoSDPJApi {
       outTradeNo: obj.outTradeNo,
       outTradeNo: obj.outTradeNo,
       nonceStr: obj.nonceStr
       nonceStr: obj.nonceStr
     };
     };
-
     let api = await this.ecompanybusiSve.findOne({
     let api = await this.ecompanybusiSve.findOne({
       appId: obj.appId,
       appId: obj.appId,
       etemplate_id: obj.ecid,
       etemplate_id: obj.ecid,
@@ -101,7 +100,12 @@ class BpoSDPJApi {
       //1.mchtId & ecid 进行联合查询 如果存在直接返回
       //1.mchtId & ecid 进行联合查询 如果存在直接返回
       let _cCashInfo = await  this.ccashinfoSve.getBean(obj);
       let _cCashInfo = await  this.ccashinfoSve.getBean(obj);
       console.log(`bpoSDPJApi.js -> cashQRCode -> mchtId & ecid 进行联合查询 :参数=` + JSON.stringify(obj) + "  _cCashInfo = " + JSON.stringify(_cCashInfo));
       console.log(`bpoSDPJApi.js -> cashQRCode -> mchtId & ecid 进行联合查询 :参数=` + JSON.stringify(obj) + "  _cCashInfo = " + JSON.stringify(_cCashInfo));
-      if(_cCashInfo){
+      //如果二维码有效直接返回
+      if(_cCashInfo.qrcode_status &&  _cCashInfo.qrcode){
+        return this.getCodeResult(0,{"qrcode": _cCashInfo.qrcode});
+      }
+      //如果二维码没有 可以继续生成二维码
+      if(_cCashInfo && _cCashInfo.qrcode){
         return this.getCodeResult(1002001,null);
         return this.getCodeResult(1002001,null);
       }
       }
       //2.检验所有参数是否完整 如果出现非法参数直接返回
       //2.检验所有参数是否完整 如果出现非法参数直接返回
@@ -120,7 +124,6 @@ class BpoSDPJApi {
         return this.getCodeResult(500,null);
         return this.getCodeResult(500,null);
       }
       }
       let _ccashinfoProperty = {};
       let _ccashinfoProperty = {};
-
       _ccashinfoProperty.app_type = _ecompanybusi.app_type;
       _ccashinfoProperty.app_type = _ecompanybusi.app_type;
       _ccashinfoProperty.outTradeNo = obj.outTradeNo;
       _ccashinfoProperty.outTradeNo = obj.outTradeNo;
       _ccashinfoProperty.mchtId = obj.mchtId;
       _ccashinfoProperty.mchtId = obj.mchtId;
@@ -140,11 +143,10 @@ class BpoSDPJApi {
       let custormUrl = `http://bpohhr.gongsibao.com?no=${_no}&outTradeNo=${_cCashInfo.outTradeNo}&mchtId=${_cCashInfo.mchtId}`;
       let custormUrl = `http://bpohhr.gongsibao.com?no=${_no}&outTradeNo=${_cCashInfo.outTradeNo}&mchtId=${_cCashInfo.mchtId}`;
       //6.生成二维码
       //6.生成二维码
       let url =await this.qrClient.generateQR(custormUrl);
       let url =await this.qrClient.generateQR(custormUrl);
-
       _cCashInfo.qrcode=url;
       _cCashInfo.qrcode=url;
       _cCashInfo.qrcode_status=1;
       _cCashInfo.qrcode_status=1;
+      _cCashInfo.sign_url=custormUrl;
       _cCashInfo.save();
       _cCashInfo.save();
-
       return this.getCodeResult(0,{"qrcode": url || ""});
       return this.getCodeResult(0,{"qrcode": url || ""});
     } catch (e) {
     } catch (e) {
       let result = {
       let result = {
@@ -250,7 +252,6 @@ class BpoSDPJApi {
       //异步推送信息
       //异步推送信息
       pushAsync(obj);
       pushAsync(obj);
 
 
-
     }catch (e) {
     }catch (e) {
       console.log(e);
       console.log(e);
       let result = {
       let result = {