资产管理后台-特殊费率修改

src/functional/mvc/service/commonUserFeeSetting.service.ts

@@ -153,32 +153,36 @@ export async function add(commonUserFeeVO: CommonUserFeeVO, currentUserId: any,
         let pair = dbInfo.pair;
         let type = dbInfo.type;
         let now = new Date();
-        let insertDbOne: any;
+        let insertDbList: any;
 
 
-        let rateLog = await buildSubmitItem(pair, dbInfo, now, dbInfo.user_channel);
+        let rateLogs = await buildSubmitItems(pair, dbInfo, now, dbInfo.user_channel);
 
         //提交到log表
         if (type == FEE_TYPE.FEE_TYPE_SPOT) {
-            insertDbOne = await feeRateSpotLog.prototype.create(rateLog, {
-                transaction: tx
+            insertDbList = await feeRateSpotLog.prototype.bulkCreate(rateLogs, {
+                transaction: tx,
+                returning: true
             });
         }
         else if (type == FEE_TYPE.FEE_TYPE_BASE_COIN_CONTRACT) {//币本位
-            insertDbOne = await feeRateBaseCoinContractLog.prototype.create(rateLog, {
-                transaction: tx
+            insertDbList = await feeRateBaseCoinContractLog.prototype.bulkCreate(rateLogs, {
+                transaction: tx,
+                returning: true
             });
         }
         else {//U本位
-            insertDbOne = await feeRateContractLog.prototype.create(rateLog, {
-                transaction: tx
+            insertDbList = await feeRateContractLog.prototype.bulkCreate(rateLogs, {
+                transaction: tx,
+                returning: true
             });
 
         }
-        let id = insertDbOne.id;
+        let idsList = insertDbList.map(item => item.id);
+        let ids = idsList.length ? idsList.join(",") : "";
 
         await commonUserFeeSetting.prototype.update({
-            fee_log_ids: id.toString(),
+            fee_log_ids: ids,
             update_time: new Date()
         }, {
             where: {
@@ -225,31 +229,35 @@ export async function update(commonUserFeeVO: CommonUserFeeVO, currentUserId: an
     let tx;
     try {
         tx = await ormDB.transaction();
-        let feeLogId: any;
+        let feeLogIds: any;
         //这四项修改需要 重新写入 rate_log
-        if (commonUserFeeVO.maker_fee != dbInfo.maker_fee || commonUserFeeVO.taker_fee != dbInfo.taker_fee
-            || commonUserFeeVO.begin_time != dbInfo.begin_time || commonUserFeeVO.expire_time != dbInfo.expire_time) {
-            let insertDbOne: any;
-            let rateLog = await buildSubmitItem(pair, commonUserFeeVO, new Date(), Number(commonUserFeeVO.user_channel));
+        if (Number(commonUserFeeVO.maker_fee) != Number(dbInfo.maker_fee) || Number(commonUserFeeVO.taker_fee) != Number(dbInfo.taker_fee)
+            || datetimeUtils.trim(commonUserFeeVO.begin_time, 's').getTime() != datetimeUtils.trim(dbInfo.begin_time, 's').getTime()
+            || datetimeUtils.trim(commonUserFeeVO.expire_time, 's').getTime() != datetimeUtils.trim(dbInfo.expire_time, 's').getTime()) {
+            let insertDbList: any;
+            let rateLogs = await buildSubmitItems(pair, commonUserFeeVO, new Date(), Number(commonUserFeeVO.user_channel));
             //提交到log表
             if (type == FEE_TYPE.FEE_TYPE_SPOT) {
-                insertDbOne = await feeRateSpotLog.prototype.create(rateLog, {
-                    transaction: tx
+                insertDbList = await feeRateSpotLog.prototype.bulkCreate(rateLogs, {
+                    transaction: tx,
+                    returning: true
                 });
             }
             else if (type == FEE_TYPE.FEE_TYPE_BASE_COIN_CONTRACT) {//币本位
-                insertDbOne = await feeRateBaseCoinContractLog.prototype.create(rateLog, {
-                    transaction: tx
+                insertDbList = await feeRateBaseCoinContractLog.prototype.bulkCreate(rateLogs, {
+                    transaction: tx,
+                    returning: true
                 });
             }
             else {//U本位
-                insertDbOne = await feeRateContractLog.prototype.create(rateLog, {
-                    transaction: tx
+                insertDbList = await feeRateContractLog.prototype.bulkCreate(rateLogs, {
+                    transaction: tx,
+                    returning: true
                 });
 
             }
-
-            feeLogId = insertDbOne.id;
+            let idsList = insertDbList.map(item => item.id);
+            feeLogIds = idsList.length ? idsList.join(",") : dbInfo.fee_log_ids;
         }
 
 
@@ -264,7 +272,7 @@ export async function update(commonUserFeeVO: CommonUserFeeVO, currentUserId: an
             amount_require_usdt: commonUserFeeVO.amount_require_usdt,
             applicant: commonUserFeeVO.applicant,
             update_time: new Date(),
-            fee_log_ids: feeLogId ? feeLogId.toString() : dbInfo.fee_log_ids,
+            fee_log_ids: feeLogIds,
         }, {
             where: {
                 id: Number(commonUserFeeVO.id)
@@ -461,10 +469,27 @@ async function getDbFeeSetting(user_id: number | any, type: number | any, user_c
     return dbInfo;
 }
 
-async function buildSubmitItem(pair: string, dbInfo: any, now: Date, user_channel: number) {
+async function buildSubmitItems(pair: string, dbInfo: any, now: Date, user_channel: number) {
+    let type = Number(dbInfo.type);
+    let submitItems: any = [];
+    let pairs: any = [];
+    //全部交易对时需要查询交易对表
+    if (pair == 'all') {
+        //现货
+        if (type == FEE_TYPE.FEE_TYPE_SPOT) {
+            pairs = await getAllSpotPairs();
+        }
+        else {//合约  这里目前查询的是 contract_pairs 如果之后 币本位的交易对有单独的表 需要修改此处代码
+            pairs = await getAllContractPairs();
+        }
+    }
+    else {
+        pairs.push(pair);
+    }
+    for (let onePair of pairs) {
         let item = {
             user_id: dbInfo.user_id,
-        pair: pair,
+            pair: onePair,
             fee_model: FEE_MODEL_SPOT_DEFAULT,
             maker_fee: dbInfo.maker_fee,
             taker_fee: dbInfo.taker_fee,
@@ -486,7 +511,9 @@ async function buildSubmitItem(pair: string, dbInfo: any, now: Date, user_channe
             item.comment = COMMENT_USER_FEE_SUBMIT
         }
 
-    return item;
+        submitItems.push(item);
+    }
+    return submitItems;
 }
 
 async function checkSpotPair(pair: string) {