Merge branch 'bpo-web' of gitlab.gongsibao.com:jiangyong/zhichan into bpo-web

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

@@ -466,11 +466,9 @@ class BpoSDPJApi {
         cashInfo.trade_status = "01";
         cashInfo.trade_status = "01";
         cashInfo.trade_desc = "提现申请成功";
         cashInfo.trade_desc = "提现申请成功";
         try {
         try {
-          let actual_amt = await this.esettleSve.findAmtByOutTradeNo({
-            busi_id: param.mchtId,
-            out_trade_no: param.outTradeNo
-          });
-          cashInfo.actual_amt = actual_amt;
+          // 张娇强烈要求
+          let actualAmt = await this.getActualAmt(cashInfo, api);
+          cashInfo.actual_amt = actualAmt;
         } catch (eeee) {
         } catch (eeee) {
           console.log(eeee);
           console.log(eeee);
         }
         }
@@ -492,7 +490,48 @@ class BpoSDPJApi {
     }
     }
   }
   }
 
 
-  async getUidStr(len, radix) {z
+  async testCashOutResult(obj, req) {
+    let cashInfo = await this.ccashinfoSve.findById(obj.id);
+    let api = await this.ecompanybusiSve.findOne({
+      appId: cashInfo.app_id,
+      etemplate_id: cashInfo.ecid,
+      mchtId: cashInfo.mchtId,
+    });
+    let actualAmt = await this.getActualAmt(cashInfo, api);
+    cashInfo.actual_amt = actualAmt;
+    await cashInfo.save();
+    return data;
+  }
+
+  async getActualAmt(cashInfo, api) {
+    let params = {
+      "appId": cashInfo.app_id,
+      "mchtId": cashInfo.mchtId,
+      nonceStr: await this.getUidStr(32, 36),
+      "currency": "CNY",
+      "outTradeNo": cashInfo.outTradeNo,
+      "seqNo": "1000",
+      "signType": "MD5",
+    };
+
+    params.sign = system.getSign(params, api.key, this.EXCEPT_KEYS);
+    let rs = await axios({
+      method: 'post',
+      url: settings.apiconfig.payDomain() + "/merchant/order/query",
+      data: params,
+    });
+    console.log(rs.data);
+    if (rs.status == 200 && rs.data.code == 0) {
+      let bizArr = (rs.data.data || {}).bizContent || [];
+      if (bizArr.length > 0) {
+        let item = bizArr[0] || {};
+        return item.actualAmt || 0;
+      }
+    }
+    return -1;
+  }
+
+  async getUidStr(len, radix) {
     var chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('');
     var chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('');
     var uuid = [],
     var uuid = [],
       i;
       i;