gsb

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

@@ -104,6 +104,16 @@ class ActionAPI extends APIBase {
             case "merchanttradesOfListAll":
             case "merchanttradesOfListAll":
                 opResult = await this.merchanttradeSve.merchanttradesOfListAll(action_body);
                 opResult = await this.merchanttradeSve.merchanttradesOfListAll(action_body);
                 break;
                 break;
+            //商户余额
+            //余额
+            case "accountbalance" :
+                opResult = await this.merchantaccountSve.accountbalance(action_body);
+                break;
+            //可用余额
+            case "accountusablebalance" :
+                opResult = await this.merchantaccountSve.accountusablebalance(action_body);
+                break;
+
             default:
             default:
                 opResult = system.getResult(null, "action_type参数错误");
                 opResult = system.getResult(null, "action_type参数错误");
                 break;
                 break;

esign-sve-merchant/app/base/db/impl/merchant/merchantaccountDao.js

@@ -6,14 +6,14 @@ class MerchantaccountDao extends Dao {
     }
     }
 
 
 
 
-    async addtomerchantrmb(params){
+    async addtomerchantrmb(params) {
         var sql = [];
         var sql = [];
         sql.push("UPDATE");
         sql.push("UPDATE");
         sql.push(this.model.tableName);
         sql.push(this.model.tableName);
-        sql.push("SET balance_amount = balance_amount+ : amount");
-        sql.push("AND available_amount = available_amount + :available_amount");
-        sql.push("WHERE merchant_id = :merchant_id")
-        return await this.customQuery(sql.join(" "), params);
+        sql.push("SET balance_amount = balance_amount + :amount,");
+        sql.push("available_amount = available_amount + :amount");
+        sql.push("WHERE merchant_id = :merchant_id");
+        return await this.customUpdate(sql.join(" "), params);
     }
     }
 }
 }
 
 

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

@@ -5,12 +5,29 @@ class MerchantaccountService extends ServiceBase {
         super("merchant", ServiceBase.getDaoName(MerchantaccountService));
         super("merchant", ServiceBase.getDaoName(MerchantaccountService));
     }
     }
 
 
-    async addtomerchantrmb(merchant_id,amount){
-        var params = {
-            merchant_id :merchant_id,
-            amount :amount
+    async addtomerchantrmb(merchant_id, amount) {
+        return await this.dao.addtomerchantrmb({
+            merchant_id: merchant_id,
+            amount: amount
+        })
+    }
+
+
+    async accountbalance(params) {
+        try {
+
+        } catch (e) {
+            console.log(e);
+        }
+    }
+
+    async accountusablebalance(params) {
+        try {
+
+        } catch (e) {
+            console.log(e);
+
         }
         }
-        return this.dao.addtomerchantrmb(params)
     }
     }
 
 
 }
 }

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

@@ -75,6 +75,7 @@ class MerchanttradeService extends ServiceBase {
     }
     }
 
 
     async auditMerchanttrade(params) {
     async auditMerchanttrade(params) {
+
         try {
         try {
             if (!params.id) {
             if (!params.id) {
                 return system.getResultFail(-1, "请提供ID");
                 return system.getResultFail(-1, "请提供ID");
@@ -85,21 +86,19 @@ class MerchanttradeService extends ServiceBase {
             if (params.audit_status == 2 && !params.audit_remark) {
             if (params.audit_status == 2 && !params.audit_remark) {
                 return system.getResultFail(-1, "请输入失败原因");
                 return system.getResultFail(-1, "请输入失败原因");
             }
             }
-
             var rtn = await this.dao.update(params);
             var rtn = await this.dao.update(params);
-
-            var trades = await this.dao.findById(params.id);
-
-            var account = await this.merchantaccountSve.findOne({merchant_id: trades.merchant_id});
-
-            if (account && params.audit_status == 1) {
-                this.merchantaccountSve.addtomerchantrmb(trades.merchant_id, trades.amount);
-            } else {
-                await this.merchantaccountSve.create({
-                    merchant_id: trades.merchant_id,
-                    balance_amount: trades.amount,
-                    available_amount: trades.amount
-                });
+            if (params.audit_status == 1) {
+                var trades = await this.dao.findById(params.id);
+                var account = await this.merchantaccountSve.findOne({merchant_id: trades.merchant_id});
+                if (account) {
+                    await this.merchantaccountSve.addtomerchantrmb(trades.merchant_id, trades.amount);
+                } else {
+                    await this.merchantaccountSve.create({
+                        merchant_id: trades.merchant_id,
+                        balance_amount: trades.amount,
+                        available_amount: trades.amount
+                    });
+                }
             }
             }
             return system.getResultSuccess(rtn);
             return system.getResultSuccess(rtn);
         } catch (e) {
         } catch (e) {
@@ -130,7 +129,7 @@ class MerchanttradeService extends ServiceBase {
             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) {
-                    this.handleDate(row, ["trade_time"], null);
+                    this.handleDate(row, ["created_at","trade_time","updated_at"], null);
                 }
                 }
             }
             }
             return system.getResultSuccess(page);
             return system.getResultSuccess(page);

esign-sve-merchant/app/config/settings.js

@@ -21,7 +21,7 @@ var settings = {
   cacheprefix: "sjb",
   cacheprefix: "sjb",
   usertimeout: 3600, //单位秒
   usertimeout: 3600, //单位秒
   basepath: path.normalize(path.join(__dirname, '../..')),
   basepath: path.normalize(path.join(__dirname, '../..')),
-  port: process.env.NODE_PORT || 3303,
+  port: process.env.NODE_PORT || 3652,
   defaultPassWord: "987456",
   defaultPassWord: "987456",
   paasUrl: function () {
   paasUrl: function () {
     if (this.env == "dev") {
     if (this.env == "dev") {
@@ -120,4 +120,4 @@ var settings = {
     }
     }
   }
   }
 };
 };
-module.exports = settings;
+module.exports = settings;
\ No newline at end of file