gsb

esign-sve-merchant/app/base/api/impl/op/action.js

@@ -78,6 +78,7 @@ class ActionAPI extends APIBase {
             case "merchantOfList":
             case "merchantOfList":
                 opResult = await this.merchantSve.merchantOfList(action_body);
                 opResult = await this.merchantSve.merchantOfList(action_body);
                 break;
                 break;
+            //获取商户信息
             case "merchantOfInfo":
             case "merchantOfInfo":
                 opResult = await this.merchantSve.merchantOfInfo(action_body);
                 opResult = await this.merchantSve.merchantOfInfo(action_body);
                 break;
                 break;

esign-sve-merchant/app/base/service/impl/merchant/merchanttradeSve.js

@@ -73,7 +73,7 @@ class MerchanttradeService extends ServiceBase {
             }
             }
             this.addWhereTime(where, 'created_at', params.beginTime, params.entTime, true);
             this.addWhereTime(where, 'created_at', params.beginTime, params.entTime, true);
             var orderby = [["id", 'desc']];
             var orderby = [["id", 'desc']];
-            var attributes = [`id`, `trade_data_id`,`trade_time`, `merchant_id`, `amount`, `audit_status`, `audit_remark`];
+            var attributes = [`id`, `trade_data_id`, `trade_time`, `merchant_id`, `amount`, `audit_status`, `audit_remark`];
             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) {
@@ -155,6 +155,28 @@ class MerchanttradeService extends ServiceBase {
             where.audit_status = {
             where.audit_status = {
                 [this.db.Op.eq]: 1
                 [this.db.Op.eq]: 1
             };
             };
+
+            if (params.timetype == 1) {
+                params.beginTime = moment().startOf('month').format("YYYY-MM-DD");
+                params.entTime = moment().endOf('month').format("YYYY-MM-DD");
+            } else if (params.timetype == 2) {
+                params.beginTime = moment().subtract(6, 'months').format("YYYY-MM-DD");
+
+                params.entTime = moment().format("YYYY-MM-DD");
+            } else if (params.timetype == 3) {
+                params.beginTime = moment().subtract(12, 'months').format("YYYY-MM-DD");
+
+                params.entTime = moment().format("YYYY-MM-DD");
+            }
+
+
+            if (params.beginTime) {
+                params.beginTime = params.beginTime + " 00:00:00";
+            }
+            if (params.entTime) {
+                params.entTime = params.entTime + " 23:59:59";
+            }
+
             this.addWhereTime(where, 'created_at', params.beginTime, params.entTime, true);
             this.addWhereTime(where, 'created_at', params.beginTime, params.entTime, true);
             var orderby = [["id", 'desc']];
             var orderby = [["id", 'desc']];
             var attributes = [];
             var attributes = [];
@@ -165,6 +187,17 @@ class MerchanttradeService extends ServiceBase {
                 }
                 }
                 await this.setMerchantName(page.rows);
                 await this.setMerchantName(page.rows);
             }
             }
+
+            if (params.merchant_id) {
+                page.balance_amount = 0;
+                page.available_amount = 0;
+                var account = await this.merchantaccountSve.findOne({merchant_id: params.merchant_id});
+                if (account) {
+                    page.balance_amount = account.balance_amount/100;
+                    page.available_amount = account.available_amount/100;
+                }
+            }
+
             return system.getResultSuccess(page);
             return system.getResultSuccess(page);
         } catch (e) {
         } catch (e) {
             console.log(e);
             console.log(e);