Merge branch 'xgg-saas-merchant' of gitlab.gongsibao.com:jiangyong/zhichan into xgg-saas-merchant

xgg-saas-merchant/app/base/controller/impl/common/metaCtl.js

@@ -4,8 +4,8 @@ const CtlBase = require("../../ctl.base");
 
 
 const crypto = require('crypto');
 const crypto = require('crypto');
 var fs = require("fs");
 var fs = require("fs");
-var accesskey = 'DHmRtFlw2Zr3KaRwUFeiu7FWATnmla';
-var accessKeyId = 'LTAIyAUK8AD04P5S';
+var accesskey = '3KV9nIwW8qkTGlrPmAe3HnR3fzM6r5';
+var accessKeyId = 'LTAI4GC5tSKvqsH2hMqj6pvd';
 var url = "https://gsb-zc.oss-cn-beijing.aliyuncs.com";
 var url = "https://gsb-zc.oss-cn-beijing.aliyuncs.com";
 
 
 var cacheBaseComp = null;
 var cacheBaseComp = null;

xgg-saas-merchant/app/base/controller/impl/common/uploadCtl.js

 var System = require("../../../system")
 var System = require("../../../system")
 const crypto = require('crypto');
 const crypto = require('crypto');
 var fs = require("fs");
 var fs = require("fs");
-var accesskey = 'DHmRtFlw2Zr3KaRwUFeiu7FWATnmla';
-var accessKeyId = 'LTAIyAUK8AD04P5S';
+var accesskey = '3KV9nIwW8qkTGlrPmAe3HnR3fzM6r5';
+var accessKeyId = 'LTAI4GC5tSKvqsH2hMqj6pvd';
 var url = "https://gsb-zc.oss-cn-beijing.aliyuncs.com";
 var url = "https://gsb-zc.oss-cn-beijing.aliyuncs.com";
 class UploadCtl {
 class UploadCtl {
   constructor() {
   constructor() {

xgg-saas-merchant/app/base/service/impl/trade/tradeSve.js

@@ -73,6 +73,8 @@ class TradeService extends ServiceBase {
     let result = await this.countAmt(itemList, info, params);
     let result = await this.countAmt(itemList, info, params);
 
 
     let current = new Date();
     let current = new Date();
+
+    let projectName;
     for (let item of itemList) {
     for (let item of itemList) {
       item.amt = system.y2f(item.actual_amt);
       item.amt = system.y2f(item.actual_amt);
       item.actual_amt = system.y2f(item.actual_amt);
       item.actual_amt = system.y2f(item.actual_amt);
@@ -85,6 +87,7 @@ class TradeService extends ServiceBase {
         item.trade_status = "00";
         item.trade_status = "00";
         item.trade_desc = "商户自行交易";
         item.trade_desc = "商户自行交易";
       }
       }
+      projectName = item.project_name;
     }
     }
 
 
     let out_trade_no = await this.redisClient.genrateId("gsb_out_trade_no");
     let out_trade_no = await this.redisClient.genrateId("gsb_out_trade_no");
@@ -102,6 +105,7 @@ class TradeService extends ServiceBase {
       acc_type: params.acc_type,
       acc_type: params.acc_type,
       order_file: params.fileUrl,
       order_file: params.fileUrl,
       order_type: order_type,
       order_type: order_type,
+      project_name: projectName,
       // 付款凭证信息
       // 付款凭证信息
       pay_voucher: "",
       pay_voucher: "",
       pay_bank_account: main.bank_account,
       pay_bank_account: main.bank_account,
@@ -224,6 +228,9 @@ class TradeService extends ServiceBase {
         return system.getResult(null, "打款文件无数据")
         return system.getResult(null, "打款文件无数据")
       }
       }
       let rows = sheet.data;
       let rows = sheet.data;
+      let projectRow = rows[2];
+      let projectName = projectRow.length >= 2 ? projectRow[1] : "";
+
       let itemList = [];
       let itemList = [];
       for (let idx = 6; idx < rows.length; idx++) {
       for (let idx = 6; idx < rows.length; idx++) {
         var data = {
         var data = {
@@ -232,20 +239,24 @@ class TradeService extends ServiceBase {
 
 
         let cells = rows[idx];
         let cells = rows[idx];
         let cellLength = cells.length;
         let cellLength = cells.length;
-
         if (cellLength == 0) {
         if (cellLength == 0) {
           continue;
           continue;
         }
         }
-        if (cellLength < 7) {
+        if (cellLength < 6) {
           data.errors.push("缺少数据, 列数不全");
           data.errors.push("缺少数据, 列数不全");
           continue;
           continue;
         }
         }
+        data.project_name = projectName;
         data.acc_name = this.trim(cells[1]);
         data.acc_name = this.trim(cells[1]);
         data.credit_code = this.trim(cells[2]).toUpperCase();
         data.credit_code = this.trim(cells[2]).toUpperCase();
         data.acc_no = this.trim(cells[3]);
         data.acc_no = this.trim(cells[3]);
         data.open_bank = this.trim(cells[4]);
         data.open_bank = this.trim(cells[4]);
         data.amt = this.trim(cells[5]);
         data.amt = this.trim(cells[5]);
+        if (cellLength == 6) {
+          data.remark = "";
+        } else {
           data.remark = this.trim(cells[6]);
           data.remark = this.trim(cells[6]);
+        }
         itemList.push(data);
         itemList.push(data);
       }
       }
 
 

xgg-saas-merchant/app/base/utils/ossClient.js

@@ -4,8 +4,8 @@ class OSSClient{
   constructor(){
   constructor(){
     this.client=new OSS({
     this.client=new OSS({
       endpoint: 'https://oss-cn-beijing.aliyuncs.com',
       endpoint: 'https://oss-cn-beijing.aliyuncs.com',
-      accessKeyId: 'LTAIyAUK8AD04P5S',
-      accessKeySecret: 'DHmRtFlw2Zr3KaRwUFeiu7FWATnmla'
+      accessKeyId: 'LTAI4GC5tSKvqsH2hMqj6pvd',
+      accessKeySecret: '3KV9nIwW8qkTGlrPmAe3HnR3fzM6r5'
     });
     });
     this.client.useBucket('gsb-zc');
     this.client.useBucket('gsb-zc');
   }
   }