gsb

esign-admin/app/base/controller/impl/merchant/merchanttradeCtl.js

@@ -14,25 +14,14 @@ class MerchantUserCtl extends CtlBase {
 
 
     async merchanttradesOfList(params, pobj2, req) {
     async merchanttradesOfList(params, pobj2, req) {
         try {
         try {
-<<<<<<< HEAD
-            let resule = await this.merchanttradeSve.merchanttradesOfList(params);
-
-            if(resule.data.rows){
-                for(let item of resule.data.rows ){
-                    item.amount =  (item.amount/100).toFixed(2)
-                }
-            }
-            return resule;
-=======
-            let res =  await this.merchanttradeSve.merchanttradesOfList(params);
-            if(res.status!=0){
+            let res = await this.merchanttradeSve.merchanttradesOfList(params);
+            if (res.status != 0) {
                 return res;
                 return res;
             }
             }
-            for(let item of res.data.rows){
+            for (let item of res.data.rows) {
                 item.amount = system.f2y(item.amount);
                 item.amount = system.f2y(item.amount);
             }
             }
             return res;
             return res;
->>>>>>> 65c1c1c1aab23279813d43a8a0fcaf5cd9edaaa5
         } catch (error) {
         } catch (error) {
             return system.getResult(null, `系统错误 错误信息 ${error}`);
             return system.getResult(null, `系统错误 错误信息 ${error}`);
         }
         }
@@ -41,7 +30,7 @@ class MerchantUserCtl extends CtlBase {
     //调账添加
     //调账添加
     async addMerchanttrades(params, pobj2, req) {
     async addMerchanttrades(params, pobj2, req) {
         try {
         try {
-            if(params.amount){
+            if (params.amount) {
                 params.amount * 100;
                 params.amount * 100;
             }
             }
             return await this.merchanttradeSve.addMerchanttrades(params);
             return await this.merchanttradeSve.addMerchanttrades(params);
@@ -62,27 +51,16 @@ class MerchantUserCtl extends CtlBase {
     //资金流水
     //资金流水
     async merchanttradesOfListAll(params, pobj2, req) {
     async merchanttradesOfListAll(params, pobj2, req) {
         try {
         try {
-<<<<<<< HEAD
-            let result = await this.merchanttradeSve.merchanttradesOfListAll(params);
-            if(result.data.rows){
-                for(let item of result.data.rows){
-                    item.balance_amount = (item.balance_amount/100).toFixed(2);
-                    item.available_amount = (item.available_amount/100).toFixed(2)
-                }
-            }
-            return result;
-=======
-            let res =  await this.merchanttradeSve.merchanttradesOfListAll(params);
-            if(res.status!=0){
+            let res = await this.merchanttradeSve.merchanttradesOfListAll(params);
+            if (res.status != 0) {
                 return res;
                 return res;
             }
             }
-            for(let item of res.data.rows){
+            for (let item of res.data.rows) {
                 item.amount = system.f2y(item.amount);
                 item.amount = system.f2y(item.amount);
                 item.available_amount = system.f2y(item.available_amount);
                 item.available_amount = system.f2y(item.available_amount);
                 item.balance_amount = system.f2y(item.balance_amount);
                 item.balance_amount = system.f2y(item.balance_amount);
             }
             }
             return res;
             return res;
->>>>>>> 65c1c1c1aab23279813d43a8a0fcaf5cd9edaaa5
         } catch (error) {
         } catch (error) {
             return system.getResult(null, `系统错误 错误信息 ${error}`);
             return system.getResult(null, `系统错误 错误信息 ${error}`);
         }
         }
@@ -98,9 +76,6 @@ class MerchantUserCtl extends CtlBase {
     }
     }
 
 
 
 
-
-
-
 }
 }
 
 
 module.exports = MerchantUserCtl;
 module.exports = MerchantUserCtl;