gsb

bpo-stat/app/base/controller/impl/all/merchantTransferCtl.js

@@ -2,13 +2,12 @@ var system = require("../../../system")
 const CtlBase = require("../../ctl.base");
 const CtlBase = require("../../ctl.base");
 
 
 
 
-//商户信息
 class MerchantTransferCtl extends CtlBase {
 class MerchantTransferCtl extends CtlBase {
     constructor() {
     constructor() {
         super("all", CtlBase.getServiceName(MerchantTransferCtl));
         super("all", CtlBase.getServiceName(MerchantTransferCtl));
     }
     }
 
 
-    //商户列表
+    //商户转账
     async transferList(qobj) {
     async transferList(qobj) {
         var params = qobj || {};
         var params = qobj || {};
         this.doTimeCondition(params, ["signBegin", "signEnd"]);
         this.doTimeCondition(params, ["signBegin", "signEnd"]);
@@ -21,11 +20,6 @@ class MerchantTransferCtl extends CtlBase {
         }
         }
     }
     }
     
     
-    async test(){
-        var page = await this.service.test();
-        return system.getResult2(page);
-    }
-
 
 
 }
 }
 
 

bpo-stat/app/base/db/models/all/merchanttransfer.js

@@ -5,6 +5,9 @@ module.exports = function (sequelize, DataTypes) {
         merchant_name: DataTypes.STRING,
         merchant_name: DataTypes.STRING,
         amt: DataTypes.STRING,
         amt: DataTypes.STRING,
         transfer_at: DataTypes.DATE,
         transfer_at: DataTypes.DATE,
+        sign_body_id : DataTypes.INTEGER,
+        sign_body : DataTypes.STRING,
+        receipt_url: DataTypes.STRING,
     }, {
     }, {
         tableName: 'merchant_transfer',
         tableName: 'merchant_transfer',
         paranoid: true,//假的删除
         paranoid: true,//假的删除

bpo-stat/app/base/db/models/all/recruit.js

@@ -12,6 +12,7 @@ module.exports = function (sequelize, DataTypes) {
     work_address: DataTypes.STRING,
     work_address: DataTypes.STRING,
     sign_body_id: DataTypes.INTEGER,
     sign_body_id: DataTypes.INTEGER,
     sign_body: DataTypes.STRING,
     sign_body: DataTypes.STRING,
+    status : DataTypes.INTEGER,
     redundance_1: DataTypes.STRING,
     redundance_1: DataTypes.STRING,
     redundance_2: DataTypes.STRING,
     redundance_2: DataTypes.STRING,
     redundance_3: DataTypes.STRING,
     redundance_3: DataTypes.STRING,

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

@@ -2,9 +2,7 @@ const system = require("../../../system");
 const ServiceBase = require("../../sve.base");
 const ServiceBase = require("../../sve.base");
 const settings = require("../../../../config/settings");
 const settings = require("../../../../config/settings");
 
 
-/**
- * 发票列表
- */
+
 class MerchantTransferService extends ServiceBase {
 class MerchantTransferService extends ServiceBase {
     constructor() {
     constructor() {
         super("all", ServiceBase.getDaoName(MerchantTransferService));
         super("all", ServiceBase.getDaoName(MerchantTransferService));
@@ -21,6 +19,11 @@ class MerchantTransferService extends ServiceBase {
                 [this.db.Op.like]: "%" + params.merchant_name + "%"
                 [this.db.Op.like]: "%" + params.merchant_name + "%"
             };
             };
         }
         }
+        if (params.merchant_name) {
+            where.merchant_name = {
+                [this.db.Op.like]: "%" + params.merchant_name + "%"
+            };
+        }
 
 
         this.addWhereTime(where, 'transfer_at', params.signBegin, params.signEnd, true);
         this.addWhereTime(where, 'transfer_at', params.signBegin, params.signEnd, true);
 
 

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

@@ -20,6 +20,9 @@ class RecruitService extends ServiceBase {
         if(params.sign_body_id){
         if(params.sign_body_id){
             where.sign_body_id = params.sign_body_id;
             where.sign_body_id = params.sign_body_id;
         }
         }
+        if(params.status){
+            where.status = params.status;
+        }
         this.addWhereTime(where, 'publish_date', params.signBegin, params.signEnd, true);
         this.addWhereTime(where, 'publish_date', params.signBegin, params.signEnd, true);
         var orderby = [
         var orderby = [
             ["id", 'desc']
             ["id", 'desc']

bpo-stat/app/config/localsettings.js

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