gsb

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

@@ -24,6 +24,13 @@ class MerchantaccountService extends ServiceBase {
             } else if (0 > params.amount) {
             } else if (0 > params.amount) {
                 return system.getResultFail(-1, "交易金额错误");
                 return system.getResultFail(-1, "交易金额错误");
             }
             }
+
+            var amount = await this.dao.findOne({merchant_id: params.merchant_id});
+
+            if (!amount) {
+                return system.getResultFail("-1", "请先充值");
+            }
+
             var data = await this.dao.addordelmerchantrmb(params);
             var data = await this.dao.addordelmerchantrmb(params);
             return system.getResultSuccess(data);
             return system.getResultSuccess(data);
         } catch (e) {
         } catch (e) {
@@ -40,8 +47,13 @@ class MerchantaccountService extends ServiceBase {
             if (!params.amount) {
             if (!params.amount) {
                 return system.getResultFail(-1, "请提供金额");
                 return system.getResultFail(-1, "请提供金额");
             }
             }
+
+            var amount = await this.dao.findOne({merchant_id: params.merchant_id});
+            if (!amount) {
+                return system.getResultFail("-1", "请先充值");
+            }
+
             if (0 > params.amount) {
             if (0 > params.amount) {
-                var amount = await this.dao.findOne({merchant_id: params.merchant_id});
                 let toam = Math.abs(params.amount);
                 let toam = Math.abs(params.amount);
                 if (0 > (amount.available_amount - toam)) {
                 if (0 > (amount.available_amount - toam)) {
                     return system.getResultFail(-1, "可用余额不足");
                     return system.getResultFail(-1, "可用余额不足");