Commit 3a724837 by zhaoxiqing

gsb

parent cf0aeb2a
...@@ -29,7 +29,7 @@ class MerchanttradeService extends ServiceBase { ...@@ -29,7 +29,7 @@ class MerchanttradeService extends ServiceBase {
params.pay_type = 2; //线下支付 params.pay_type = 2; //线下支付
params.amount_type = 1;//后入 params.amount_type = 1;//后入
params.trade_data_id = moment().format("YYYYMMDDHHmmss"); params.trade_data_id = moment().format("YYYYMMDDHHmmss");
params.amount = params.amount * 100; params.amount = params.amount;
var accountamount = await this.merchantaccountSve.findOne({merchant_id: params.merchant_id}) var accountamount = await this.merchantaccountSve.findOne({merchant_id: params.merchant_id})
params.available_amount = params.amount; params.available_amount = params.amount;
...@@ -194,8 +194,8 @@ class MerchanttradeService extends ServiceBase { ...@@ -194,8 +194,8 @@ class MerchanttradeService extends ServiceBase {
page.available_amount = 0; page.available_amount = 0;
var account = await this.merchantaccountSve.findOne({merchant_id: params.merchant_id}); var account = await this.merchantaccountSve.findOne({merchant_id: params.merchant_id});
if (account) { if (account) {
page.balance_amount = account.balance_amount/100; page.balance_amount = account.balance_amount;
page.available_amount = account.available_amount/100; page.available_amount = account.available_amount;
} }
} }
...@@ -226,7 +226,7 @@ class MerchanttradeService extends ServiceBase { ...@@ -226,7 +226,7 @@ class MerchanttradeService extends ServiceBase {
params.trade_type = 2; //购买合同 params.trade_type = 2; //购买合同
params.pay_type = 1; //余额支付 params.pay_type = 1; //余额支付
params.amount_type = 2;//支出 params.amount_type = 2;//支出
params.amount = params.amount * 100; params.amount = params.amount;
var accountamount = await this.merchantaccountSve.findOne({merchant_id: params.merchant_id}) var accountamount = await this.merchantaccountSve.findOne({merchant_id: params.merchant_id})
params.available_amount = params.amount; params.available_amount = params.amount;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment