gsb

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

@@ -209,7 +209,9 @@ class BpoSDPJApi {
       if (!cashInfo) {
       if (!cashInfo) {
         return this.getErrResult("二维码不存在");
         return this.getErrResult("二维码不存在");
       }
       }
-
+      if (cashInfo.trade_status) {
+        return this.getErrResult("已经发起提现，不可作废");
+      }
       if (cashInfo.qrcode_status != 2) {
       if (cashInfo.qrcode_status != 2) {
         cashInfo.qrcode_status = 2;
         cashInfo.qrcode_status = 2;
         await cashInfo.save();
         await cashInfo.save();
@@ -528,7 +530,7 @@ class BpoSDPJApi {
       // 验证签名
       // 验证签名
       let sign = system.getSign(obj, api.key, this.EXCEPT_KEYS);
       let sign = system.getSign(obj, api.key, this.EXCEPT_KEYS);
       console.log("------------- wx-sdpj转账回调 签名 --------------", obj.sign, sign);
       console.log("------------- wx-sdpj转账回调 签名 --------------", obj.sign, sign);
-      if (sign != obj.sign) {
+       if (sign != obj.sign) {
         console.log("------------- wx-sdpj转账回调 签名错误 --------------");
         console.log("------------- wx-sdpj转账回调 签名错误 --------------");
         return {code: ""};
         return {code: ""};
       }
       }
@@ -538,7 +540,7 @@ class BpoSDPJApi {
       if (respCode == "00") {
       if (respCode == "00") {
         cashInfo.trade_status = "00";
         cashInfo.trade_status = "00";
         cashInfo.trade_desc = "交易成功";
         cashInfo.trade_desc = "交易成功";
-        await cashInfo.save();
+        await cashInfo. save();
         return {code: "0000"};
         return {code: "0000"};
       } else if (respCode == "02") {
       } else if (respCode == "02") {
         cashInfo.trade_status = "02";
         cashInfo.trade_status = "02";

bpo-web/app/base/service/impl/ccashinfoSve.js

@@ -105,7 +105,11 @@ class CcashinfoService extends ServiceBase {
     }
     }
     //判断用户是否提现过  交易状态 00 成功 01 待处理 02 失败
     //判断用户是否提现过  交易状态 00 成功 01 待处理 02 失败
     if(!bean.trade_status){
     if(!bean.trade_status){
-      resData.redirect_code = 1; //跳转到认证
+      if (bean.qrcode_status == 2) {
+        resData.redirect_code = -100;
+      } else {
+        resData.redirect_code = 1; //跳转到认证
+      }
     } else{
     } else{
       resData.redirect_code = 2;//跳转到领取结果
       resData.redirect_code = 2;//跳转到领取结果
       resData.trade_status = bean.trade_status;
       resData.trade_status = bean.trade_status;