dd

bpo-stat/app/base/service/impl/all/invoiceSve.js

@@ -21,9 +21,9 @@ class InvoiceService extends ServiceBase {
       };
       };
     }
     }
 
 
-    if(params.id_no){
-      where.id_no = this.trim(params.id_no);
-    }
+    // if(params.id_no){
+    //   where.id_no = this.trim(params.id_no);
+    // }
 
 
     if (params.invoiceType) {
     if (params.invoiceType) {
       where.invoiceType = Number(params.invoiceType);
       where.invoiceType = Number(params.invoiceType);

bpo-stat/app/base/service/impl/all/transactioninSve.js

@@ -38,7 +38,7 @@ class TransactioninService extends ServiceBase {
             ["id", 'desc']
             ["id", 'desc']
         ];
         ];
 
 
-        var attributes = [`id`, `company_name`, `id_name`, `id_no`, `bank_no`, `actual_amount`, `transaction_time`, `sign_body`,`order_item_id`, `channel_rsp_no`];
+        var attributes = [`id`, `company_name`, `id_name`, `id_no`, `bank_no`,`invoiceId`, `actual_amount`,`deduct_amt`, `transaction_time`, `sign_body`,`order_item_id`, `channel_rsp_no`];
         var page = await this.getPageList(currentPage, pageSize, where, orderby, attributes);
         var page = await this.getPageList(currentPage, pageSize, where, orderby, attributes);
         if (page && page.rows) {
         if (page && page.rows) {
             for (var row of page.rows) {
             for (var row of page.rows) {

bpo-stat/app/config/localsettings.js

@@ -6,19 +6,19 @@ var settings={
     db:10,
     db:10,
   },
   },
   database:{
   database:{
-    dbname : "stat",
-    user: "root",
-    password: "!@#Qaz741",
-    config: {
-      host: 'rm-2ze5muw8tb37i3ig4lo.mysql.rds.aliyuncs.com',
-    // dbname : "bpo_stat",
-    // user: "write",
-    // password: "write",
+    // dbname : "stat",
+    // user: "root",
+    // password: "!@#Qaz741",
     // config: {
     // config: {
-    //   host: '192.168.18.237',
+      // host: 'rm-2ze5muw8tb37i3ig4lo.mysql.rds.aliyuncs.com',
+    dbname : "bpo_stat",
+    user: "write",
+    password: "write",
+    config: {
+      host: '192.168.18.237',
       port: 3306,
       port: 3306,
       // host: '43.247.184.35',
       // host: '43.247.184.35',
-      // port: 8899,s
+      // port: 8899,
       dialect: 'mysql',
       dialect: 'mysql',
         operatorsAliases: false,
         operatorsAliases: false,
         pool: {
         pool: {