gsb

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

@@ -160,7 +160,7 @@ class BpoSDPJApi {
       let _no = await this.setNo(_cCashInfo.id.toString());
       _no = encodeURIComponent(_no);
       let custormUrl = `https://bpohhr.gongsibao.com/sdpj?no=${_no}&outTradeNo=${_cCashInfo.outTradeNo}&mchtId=${_cCashInfo.mchtId}`;
-      console.log("----------------->"+custormUrl);
+      console.log("----------------->" + custormUrl);
       // 生成二维码
       let url = await this.qrClient.generateQR(custormUrl);
       _cCashInfo.qrcode = url;
@@ -358,7 +358,7 @@ class BpoSDPJApi {
       // console.log("调用二要素 （兰伯望） 接口返回："+JSON.stringify(doAuthRes));
       await this.doSign3(cashInfo, cashUser);
 
-      return this.getCodeResult(0, {redirect_code : 3});
+      return this.getCodeResult(0, {redirect_code: 3});
     } catch (e) {
       console.log(e);
       let result = {
@@ -396,10 +396,10 @@ class BpoSDPJApi {
       }
       if (ccashinfo.qrcode_status != 1) {
         // 1 认证页面 2 二维码已失效 3 红包领取页面 4 红包领取结果页面（心跳查询） 5 红包已被领取
-        return this.getCodeResult(0, {redirect_code : 2});
+        return this.getCodeResult(0, {redirect_code: 2});
       }
       if (ccashinfo.trade_status) {
-        return this.getCodeResult(0, {redirect_code : 5});
+        return this.getCodeResult(0, {redirect_code: 5});
       }
 
       let api = await this.ecompanybusiSve.findOne({
@@ -409,7 +409,7 @@ class BpoSDPJApi {
       });
 
       await this.redisLock.lock(key, _lock, 20);
-      let result = await this.cashOut(ccashinfo,api, cashUser);
+      let result = await this.cashOut(ccashinfo, api, cashUser);
       return result;
     } catch (e) {
       console.log(e);
@@ -463,13 +463,13 @@ class BpoSDPJApi {
     }
   }
 
-  async cashOut(cashInfo, api,cashUser) {
+  async cashOut(cashInfo, api, cashUser) {
     if (cashInfo.qrcode_status != 1) {
       // 1 认证页面 2 二维码已失效 3 红包领取页面 4 红包领取结果页面（心跳查询） 5 红包已被领取
-      return this.getCodeResult(0, {redirect_code : 2});
+      return this.getCodeResult(0, {redirect_code: 2});
     }
     if (cashInfo.trade_status) {
-      return this.getCodeResult(0, {redirect_code : 5});
+      return this.getCodeResult(0, {redirect_code: 5});
     }
 
     console.log("张娇要看的时间发起提现---------------------------", cashInfo.outTradeNo, new Date().getTime());
@@ -539,12 +539,12 @@ class BpoSDPJApi {
         }
         await cashInfo.save();
         // 1 认证页面 2 二维码已失效 3 红包领取页面 4 红包领取结果页面（心跳查询） 5 红包已被领取
-        return this.getSuccessResult("提现成功",  {redirect_code : 4});
+        return this.getSuccessResult("提现成功", {redirect_code: 4});
       } else {
         cashInfo.trade_status = "02";
         cashInfo.trade_desc = rs.data.msg || "提现申请失败";
         await cashInfo.save();
-        return this.getSuccessResult(rs.data.msg || "领取失败",  {redirect_code : 6});
+        return this.getSuccessResult(rs.data.msg || "领取失败", {redirect_code: 6});
       }
     } catch (error) {
       console.log(error);
@@ -556,16 +556,29 @@ class BpoSDPJApi {
     let id = Number(this.getNo(obj.no) || 0);
     let cashInfo = await this.ccashinfoSve.findById(id);
 
-    if (cashInfo.trade_status == "00" || cashInfo.trade_status == "02") {
-      // let actualAmt = await this.getActualAmt(cashInfo, api);
-      // cashInfo.actual_amt = actualAmt;
-      // await cashInfo.save();
+    // 查是否成功
+    let item = await this.esettleSve.findOrderItemByOutTradeNo({
+      busi_id: cashInfo.mchtId,
+      out_trade_no: cashInfo.outTradeNo,
+      seq_no: "1000",
+    });
+    console.log("查smart ------------------", id, item, new Date().getTime());
+    // let actualAmt = await this.getActualAmt(cashInfo, api);
+    // cashInfo.actual_amt = actualAmt;
+    // await cashInfo.save();
+
+    if (item.trade_status == "00" || item.trade_status == "02" || item.trade_status == "03") {
       // 1 认证页面 2 二维码已失效 3 红包领取页面 4 红包领取结果页面（心跳查询） 5 红包已被领取
-      let rc = cashInfo.trade_status == "00" ? 4 : 6;
-      return this.getBaseResult(0, cashInfo.trade_desc, {redirect_code : rc, trade_desc: cashInfo.trade_desc, complete: true, actual_amt: system.f2y(cashInfo.actual_amt)});
+      let rc = item.trade_status == "00" ? 4 : 6;
+      return this.getBaseResult(0, cashInfo.trade_desc, {
+        redirect_code: rc,
+        trade_desc: cashInfo.trade_desc,
+        complete: true,
+        actual_amt: system.f2y(cashInfo.actual_amt)
+      });
     }
     // 1 认证页面 2 二维码已失效 3 红包领取页面 4 红包领取结果页面（心跳查询） 5 红包已被领取
-    return this.getBaseResult(0, "交易未完成", {complete: false});
+    return this.getBaseResult(0, "交易未完成", {complete: false, actual_amt: system.f2y(cashInfo.actual_amt)});
   }
 
   async testCashOutResult(obj, req) {

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

@@ -465,6 +465,23 @@ class EsettleService extends ServiceBase {
         return {count: total, rows: list};
     }
 
+    async findOrderItemByOutTradeNo(params) {
+        let sql = [];
+        sql.push("SELECT");
+        sql.push("*");
+        sql.push("FROM tbl_order_item");
+        sql.push("WHERE");
+        sql.push("busi_id = :busi_id ");
+        sql.push("AND out_trade_no = :out_trade_no");
+        sql.push("AND seq_no = :seq_no");
+
+        let list = await this.settledb.query(sql.join(" "), {replacements: params});
+        if (list && list.length > 0) {
+            list = list[0, 0] || [];
+        }
+        return list && list.length > 0 ? list[0] : null;
+    }
+
     async doCommission(orderId) {
         var tblorder = await this.findTBLOrderById(orderId);
         if (!tblorder || !tblorder.company_name) {